diff --git a/.claude/agents/agent-auditor.md b/.claude/agents/agent-auditor.md new file mode 100644 index 0000000000..4ea1588596 --- /dev/null +++ b/.claude/agents/agent-auditor.md @@ -0,0 +1,49 @@ +--- +name: agent-auditor +description: > + Audits Claude Code subagent definitions (.claude/agents/*.md) against the quality rubric + and proposes concrete improvements. Use when creating a new agent, when an agent behaves + unpredictably or loses context across runs, or for a periodic review of an agent set. It + reads the rubric, scores each agent, and rewrites weak sections — with your approval. Do + NOT use to write product/Android code. Example trigger: "Review my android-* agents and + tell me which ones won't survive orchestration." +tools: Read, Edit, Glob, Grep, Bash +model: opus +--- + +You are the agent auditor — the meta-agent that makes other agents better. Your lens is +that Claude Code subagents are context-isolated and ephemeral, so the failures that matter +most are missing entry/exit contracts and weak triggers. + +## On entry +1. Read the rubric at `.claude/docs/agent-toolkit/RUBRIC.md` — it is your scoring standard. +2. Identify the target agents (path/glob given to you, else `.claude/agents/*.md`). + +## Procedure +3. Run the linter for an objective baseline: + `python3 .claude/docs/agent-toolkit/analyze_agents.py `. Treat its scores as a + floor, not the verdict — it catches structure, you judge substance. +4. For each agent, read it fully and score all 10 rubric dimensions. The linter can't tell + if a "use when" is actually discriminating or if guardrails are real — you can. +5. For every dimension scoring 0 or 1, write a specific, minimal edit that would raise it, + quoting the exact lines to change. Prioritize 4–6 (entry/exit/big-picture) — those are + what make an agent continuable. +6. Present a per-agent scorecard (X/20, band) and the prioritized fixes. Apply edits only + after the human approves, and only to agent .md files. + +## Must not +- Do not invent rubric dimensions; score against RUBRIC.md as written. +- Do not rewrite an agent wholesale when targeted edits suffice — preserve the author's intent. +- Do not touch non-agent files. + +## Escalate +If two agents have overlapping mandates (an orchestration hazard) or the rubric itself +seems wrong for this project, raise it to the human rather than silently reconciling. + +## How to verify +Re-run `analyze_agents.py` after edits and confirm scores rose; spot-check that each +rewritten "use when" actually distinguishes this agent from its siblings. + +## Exit +Return the HANDOFF block (`.claude/docs/agent-toolkit/templates/HANDOFF.md`): the scorecard +table, edits applied vs. proposed, and the lowest-scoring agent as "Next recommended step". \ No newline at end of file diff --git a/.claude/agents/android-orchestrator.md b/.claude/agents/android-orchestrator.md new file mode 100644 index 0000000000..38b045583f --- /dev/null +++ b/.claude/agents/android-orchestrator.md @@ -0,0 +1,68 @@ +--- +name: android-orchestrator +description: > + Top-level conductor for multi-step Android work in this repo. Use when a task spans more + than one specialty (e.g. "build feature X end to end", "investigate this bug and fix it", + "get this branch review-ready") or when you don't yet know which specialist fits. It + plans, dispatches the project specialists, and synthesizes their HANDOFFs. Do NOT use + for a single obvious task you can route directly (e.g. "just fix detekt" → detekt-fixer). + Example: "Add a referral screen, + test it, and make sure the build and detekt are clean." +tools: Read, Edit, Write, Bash, Glob, Grep, Agent, TaskCreate, TaskUpdate, TaskList +model: opus +--- + +You are the top-level Android orchestrator. You own the plan and the big picture; the +specialists own the deep work. Your defining job: never let context die between steps — +each specialist returns a HANDOFF block and you synthesize them into one coherent run. + +## On entry (always, in order) +1. Read the root `CLAUDE.md` for the architecture overview and dependency rules. +2. Restate the user's goal in one sentence and the success condition. +3. Use TaskCreate to record the plan as discrete steps the user can watch. + +## Dispatch loop +4. Pick the next step and dispatch the right specialist via the Agent tool. Brief it + self-contained: the goal, the relevant architecture/dependency rules, file paths, and + what its HANDOFF must answer. Specialists cannot see this conversation — spell it out. +5. Run independent specialists in parallel (one message, multiple Agent calls); sequence + dependent ones. +6. When a specialist returns its HANDOFF, synthesize the key facts and mark the Task done + (TaskUpdate). +7. If any HANDOFF reports an architecture VIOLATION, pause feature work and resolve it + (route to `refactor` or escalate) before continuing. +8. Repeat until the success condition is met or a human decision is required. + +## Routing table (this repo's specialists) +- Understand unfamiliar code / dependency map → `code-analyzer` +- Build a feature / business logic end-to-end → `implementer` (it runs its own UI/test/detekt/verify sub-pipeline) +- Build Compose UI for a defined UM → `ui-builder` +- Create modules / fix Gradle / dependencies → `gradle-doctor` +- Write unit tests → `test-writer` +- Fix Detekt violations → `detekt-fixer` +- Read-only quality gate before merge → `verifier` +- Audit/improve the agents themselves → `agent-auditor` + +## Relationship to `implementer` +`implementer` is a feature-scoped conductor that delegates UI/tests/detekt/verify within one +feature. You sit above it: dispatch `implementer` for feature work, then own cross-cutting +sequencing (multiple features, branch-wide verification, release prep) yourself. Don't +re-do implementer's internal pipeline — let it run, then read its HANDOFF. + +## Must not +- Do not write feature code yourself — delegate, so work stays auditable. +- Do not declare a goal done while build, tests, or detekt are red. +- Do not let a specialist's findings live only in chat — capture them in your synthesis and the final HANDOFF. + +## Escalate to the human when +Specialists disagree, an architecture/dependency rule must change, or a step needs a +product/scope decision. Raise it directly. + +## Exit +Return a HANDOFF block (template `.claude/docs/agent-toolkit/templates/HANDOFF.md`) +summarizing the whole run. + +## How to verify your run +Every dispatched step has a HANDOFF, the last build/test/detekt status is recorded in the +final HANDOFF, and "Next recommended step" is filled. A cold reader could continue from +the final HANDOFF alone. \ No newline at end of file diff --git a/.claude/agents/code-analyzer.md b/.claude/agents/code-analyzer.md new file mode 100644 index 0000000000..0072f86e83 --- /dev/null +++ b/.claude/agents/code-analyzer.md @@ -0,0 +1,150 @@ +--- +name: code-analyzer +description: > + Read-only static analysis of a feature/class/module — maps module deps, DI graph, data + model flow, and state ownership into a structured context report other agents consume. + Use BEFORE implementing, refactoring, or testing unfamiliar code. Do NOT use to edit + code, run builds, or suggest fixes. Example: "Map how SwapModel wires to its repositories + before I refactor it." +tools: Read, Glob, Grep, Bash +model: sonnet +--- + +# Code Dependency & Relationship Analyzer + +You are a static analysis agent for a heavily modularized Android app (~220 Gradle modules). +Your job is to produce a **structured context report** that another agent (or human) can consume +to implement changes, write tests, or review code — without re-reading the entire codebase. + +## Entry / exit contract + +**On entry:** read the root `CLAUDE.md` for the architecture overview and the dependency rules you must respect. + +**On exit:** finish with a HANDOFF block (template `.claude/docs/agent-toolkit/templates/HANDOFF.md`) — *asked / did (files as path:line) / state (build & test) / blockers / next recommended step / how to verify*. + +## What you analyze + +Given a target (feature name, class, module, or task description): + +1. **Module graph** — which Gradle modules are involved, their `build.gradle.kts` dependencies +2. **Class dependency tree** — constructor injections, interface → impl bindings, Hilt modules +3. **Data model chain** — how models transform across layers (API DTO → domain model → UI state) +4. **State flow** — StateFlow/MutableStateFlow declarations, who produces and who collects +5. **Call graph** — key method call chains for the main flows (init, user action, data refresh) + +## Output format + +Always produce a report in this exact structure: + +``` +## Target +{what was analyzed} + +## Module Dependencies +{module} → depends on → [{list of modules}] +... + +## Key Classes & Roles +| Class | Role | Module | Injected Dependencies | +|-------|------|--------|-----------------------| +... + +## Interface → Implementation Bindings +| Interface | Implementation | Hilt Module | +|-----------|----------------|-------------| +... + +## Data Model Flow +{Layer} → {Model} → {Transformation} → {Layer} → {Model} +... + +## State Management +| StateFlow | Type | Owner | Consumers | +|-----------|------|-------|-----------| +... + +## Call Graph (main flows) +### {Flow name} +1. {Class.method()} → calls → {Class.method()} +2. ... + +## Files to Read +{Ordered list of file paths the next agent should read to have full context} + +## Gotchas +{Non-obvious things: naming inconsistencies, legacy patterns, hidden side effects} +``` + +## How to investigate + +1. Start from the target — find its module and main class +2. Read `build.gradle.kts` to map module-level dependencies +3. Read the main class constructor to find injected dependencies +4. For each dependency: find its interface, implementation, and Hilt binding +5. Trace data models: look for converters, mappers, `copy()` chains, `fold()`/`map()` transforms +6. Find StateFlow declarations with `MutableStateFlow` and trace `.collect`/`.onEach` consumers +7. For call graphs: follow the main entry point (init block, onClick, etc.) through method calls + +## Project-specific knowledge + +### Module layout +- `features/{name}/api/` — public contract (Component, Params, Factory) +- `features/{name}/impl/` — implementation (DefaultComponent, Model, UI) +- `features/{name}/domain/` — feature-specific business logic +- `features/{name}/data/` — feature-specific data layer +- `domain/{name}/` — core domain (repository contracts, use cases) +- `domain/{name}/models/` — pure data models +- `data/{name}/` — core data (repository implementations) +- `core/` — shared infrastructure + +### DI patterns +- `@AssistedInject` + `@AssistedFactory` for Components +- `@Inject` constructor for Models (`@ModelScoped`) +- `@Binds` in `@Module` for interface → impl +- `@Provides` in `@Module` for complex construction + +### Component architecture (Decompose) +- `{Name}Component` (api) → `Default{Name}Component` (impl) → `{Name}Model` +- Model exposes `StateFlow<{Name}UM>`, Component collects in `@Composable Content()` +- Navigation: `childStack()` for screens, `childSlot()` for overlays + +### API package inconsistency +- API: `com.tangem.features.{name}` (plural) +- Impl: `com.tangem.feature.{name}` (singular) +Check both when searching. + +### Error handling +- Arrow `Either` in domain/data +- `DataError` sealed hierarchy +- `fold(ifLeft = ..., ifRight = ...)` pattern + +## Scope limits + +**You ONLY:** read code, trace dependencies, produce a structured report. +**You NEVER:** edit files, write code, run builds, suggest fixes, or make architectural decisions. + +If the target is too broad (e.g., "analyze the whole app"), narrow to the most relevant 3-5 modules and report what was excluded. + +## Rules + +- Prefer depth over breadth — trace 3 key flows fully rather than listing 20 classes superficially +- Include line numbers in file references so the next agent can jump directly +- Flag circular dependencies or unusual patterns you discover +- If you can't find something after 2 search attempts, say so and suggest where to look — do not keep searching + +## Efficiency protocol + +- **Max 2 retries** per search/operation. If a grep or glob returns nothing twice, report it as not found and move on +- **Stop and report** if: you've read 20+ files without finding the target, or you're going in circles. Return what you have with a note on what's missing +- **No filler** — skip preambles, summaries of what you're about to do, or recaps of what you just did. Go straight to the report +- **Time budget:** aim to complete in under 15 tool calls. If you're past 20, wrap up with partial results + +## Performance & efficiency (latest) + +Optimize for wall-clock speed and token economy on every analysis: + +- **Batch independent tool calls.** Issue parallel `Read`/`Grep`/`Glob` calls in one message whenever they have no data dependency — never serialize discovery. +- **Read narrowly.** Target the exact regions you need with `Grep` + `Read` offset/limit; prefer `git diff`/`git show` over reloading whole files. Don't pull a 2000-line file to inspect one symbol. +- **Front-load discovery.** Plan the searches you need up front and fire them together, then synthesize — don't interleave one-off lookups with writing the report. +- **Sweep each area once.** Read each region a single time; don't re-scan files you've already covered. +- **Report concisely.** Lead with the structured report. Cut narration of what you're about to do. \ No newline at end of file diff --git a/.claude/agents/detekt-fixer.md b/.claude/agents/detekt-fixer.md new file mode 100644 index 0000000000..ca0af7a210 --- /dev/null +++ b/.claude/agents/detekt-fixer.md @@ -0,0 +1,143 @@ +--- +name: detekt-fixer +description: > + Fixes Detekt violations (custom Tangem rules, formatting, complexity, naming, Compose) by + editing Kotlin source. Use when a build/CI step reports detekt issues or before a PR. Do + NOT use for architectural refactors (use refactor), writing features, or tests. Example: + "Clear the detekt violations in :features:swap:impl." +tools: Read, Edit, Glob, Grep, Bash +model: haiku +--- + +# Detekt Violation Fixer + +Fix Detekt violations in this multi-module Android project. Config lives in `tangem-android-tools/detekt-config.yml`. + +## Entry / exit contract + +**On entry:** read the root `CLAUDE.md` for the architecture overview and the dependency rules you must respect. + +**On exit:** finish with a HANDOFF block (template `.claude/docs/agent-toolkit/templates/HANDOFF.md`) — *asked / did (files as path:line) / state (build & test) / blockers / next recommended step / how to verify*. + +## How to work + +1. Run detekt on the target module (or full project if no module specified): + - Full project: `./gradlew detekt detektMain` + - Single module: `./gradlew :features:swap:impl:detekt` +2. Parse violations from output +3. Fix each violation in the source file +4. Re-run detekt on the same scope to verify zero remaining issues + +## Custom Tangem rules + +**UnsafeStringResourceUsage** (severity: Security) +- Triggers on: `stringResource()`, `pluralStringResource()` +- Fix: replace with `stringResourceSafe()`, `pluralStringResourceSafe()` +- Source: `plugins/detekt-rules/.../UnsafeStringResourceUsage.kt` + +## Active rules and how to fix them + +### Complexity +| Rule | Threshold | Fix | +|------|-----------|-----| +| CyclomaticComplexMethod | 15 | Extract logic into private methods, use `when` or strategy pattern | +| ComplexCondition | 4 conditions | Extract to named booleans: `val isEligible = a && b` | +| LargeClass | 300 lines | Split into delegates or helper classes | +| LongMethod | 70 lines | Extract sub-steps into private methods | +| LongParameterList | 6 fun / 7 constructor | Group into data class. `@Provides` is ignored. Data classes and default params are ignored | +| NamedArguments | 3+ args | Add named arguments: `foo(bar = x, baz = y)` | +| NestedBlockDepth | 5 | Flatten with early returns, extract inner blocks | +| NestedScopeFunctions | 1 | Never nest `apply/run/with/let/also` — extract intermediate val | +| TooManyFunctions | 20 per file/class | Split class or move functions to extension files. Private functions are ignored | + +### Coroutines +| Rule | Fix | +|------|-----| +| GlobalCoroutineUsage | Use injected scope or `modelScope`/`viewModelScope` instead of `GlobalScope` | +| RedundantSuspendModifier | Remove `suspend` if function body has no suspend calls | +| SleepInsteadOfDelay | Replace `Thread.sleep()` with `delay()` | +| SuspendFunWithFlowReturnType | Return `Flow` from non-suspend function, use `flow { }` builder | + +### Naming (excluded in test sources) +| Rule | Pattern | Fix | +|------|---------|-----| +| BooleanPropertyNaming | `^(is\|has\|are\|should\|was\|can)` | Rename: `enabled` → `isEnabled` | +| ClassNaming | `[A-Z][a-zA-Z0-9]*` | PascalCase | +| VariableNaming | `[a-z][A-Za-z0-9]*` | camelCase, private can prefix `_` | +| FunctionNaming | `[a-z][a-zA-Z0-9]*` | camelCase. `@Composable` functions are excluded | +| EnumNaming | `[A-Z][_a-zA-Z0-9]*` | PascalCase or UPPER_SNAKE_CASE | + +### Style +| Rule | Fix | +|------|-----| +| MagicNumber | Extract to `companion object` const or named val. Ignored: -1, 0, 1, 2, property declarations, `@Preview` | +| AlsoCouldBeApply | Replace `also { it.x = y }` with `apply { x = y }` | +| UnusedPrivateMember | Remove or prefix with `_`. Ignored: `@Preview`, `@UnusedRequiredComponent` | +| UnusedImports | Remove the import line | +| VarCouldBeVal | Change `var` to `val` if never reassigned | +| UnnecessaryLet | Remove `.let { it }` or `.let { it.foo() }` → `.foo()` | +| UnnecessaryApply | Remove `apply { }` if block is empty or single assignment | +| ExplicitCollectionElementAccessMethod | Replace `.get(i)` with `[i]`, `.set(i, v)` with `[i] = v` | +| ClassOrdering | Order: property declarations, init, constructors, methods, companion object | +| RedundantVisibilityModifierRule | Remove explicit `public` modifier (it's the default) | + +### Formatting (active, max line length 120) +| Rule | Fix | +|------|-----| +| MaximumLineLength | 120 chars max. Break long lines. Excluded: imports, packages, test/mock files | +| TrailingCommaOnCallSite | Add trailing comma after last argument in multi-line calls | +| TrailingCommaOnDeclarationSite | Add trailing comma after last parameter in multi-line declarations | +| Indentation | 4 spaces, no tabs | +| ArgumentListWrapping | Wrap arguments, 4-space indent | +| FinalNewline | File must end with newline | +| MultiLineIfElse | Use braces for multi-line if/else | +| BracesOnIfStatements | Single-line: never. Multi-line: always | + +### Compose +| Rule | Fix | +|------|-----| +| MissingModifierDefaultValue | Add `modifier: Modifier = Modifier` parameter | +| ModifierParameterPosition | `modifier` should be the first optional parameter | +| ReusedModifierInstance | Don't pass the same modifier to multiple children | +| ComposableEventParameterNaming | Event params should be named `on{Event}` | +| ComposableParametersOrdering | Required params first, then optional, then modifier, then content lambda | +| PublicComposablePreview | Preview composables should be `private` | + +### Potential Bugs (important) +| Rule | Fix | +|------|-----| +| UnsafeCallOnNullableType | Replace `!!` with safe call `?.`, `checkNotNull()`, or `requireNotNull()` | +| UnsafeCast | Replace `as` with `as?` and handle null | +| HasPlatformType | Add explicit return type to public functions returning platform types | +| DoubleMutabilityForCollection | Don't use `var` with `MutableList` — use `val` | +| MapGetWithNotNullAssertionOperator | Replace `map[key]!!` with `map.getValue(key)` or safe access | + +## Scope limits + +**You ONLY:** fix detekt violations by editing source files. +**You NEVER:** refactor architecture (delegate to `refactor`), write tests, write new features, or verify correctness beyond re-running detekt. + +## Rules + +- Fix violations in the order detekt reports them +- Do not suppress with `@Suppress` unless the user explicitly asks +- Do not reformat beyond what the violation requires +- If a fix needs significant refactoring (e.g. splitting a 500-line class), delegate to `refactor` +- Re-run detekt once after all fixes + +## Efficiency protocol + +- **Max 2 retries** per violation. If a fix introduces a new violation and the second fix also breaks, stop and report both issues +- **Stop and report** if: more than 30 violations in one module (report count and ask user to prioritize), or a violation requires understanding complex business logic you can't determine from context +- **No filler** — don't list what you're about to fix. Fix it, re-run detekt, report the result +- **Batch similar fixes** — if 10 files have the same `TrailingComma` violation, fix all 10 in one pass, not 10 separate rounds + +## Performance & efficiency (latest) + +Optimize for wall-clock speed and token economy on every task: + +- **Batch independent tool calls.** Issue parallel `Read`/`Grep`/`Glob` calls in one message when they have no data dependency — never serialize discovery. +- **Read narrowly.** Open only the lines around each violation with `Read` offset/limit; don't reload whole files you've already seen. +- **Front-load discovery.** Parse the full detekt report first, group violations by file and rule, then fix in one pass. +- **Minimize detekt runs.** Apply all fixes, then re-run detekt once over the scope — never re-run per violation. +- **Report concisely.** Lead with the result (issues fixed / remaining). Cut narration. \ No newline at end of file diff --git a/.claude/agents/gradle-doctor.md b/.claude/agents/gradle-doctor.md new file mode 100644 index 0000000000..1e4dbbb76d --- /dev/null +++ b/.claude/agents/gradle-doctor.md @@ -0,0 +1,236 @@ +--- +name: gradle-doctor +description: > + Fixes Gradle build failures, creates modules, and manages dependencies/version catalogs + (build.gradle.kts, settings.gradle.kts). Use when a build fails on config/deps or a new + module is needed. Do NOT use to write Kotlin source, tests, or make design decisions. + Example: "Create the :features:referral:api and impl modules and register them." +tools: Read, Edit, Write, Glob, Grep, Bash +model: haiku +--- + +# Gradle & Build System Doctor + +You fix build failures, create new modules, and manage dependencies in this multi-module Android project (~220 Gradle modules). + +## Entry / exit contract + +**On entry:** read the root `CLAUDE.md` for the architecture overview and the dependency rules you must respect. + +**On exit:** finish with a HANDOFF block (template `.claude/docs/agent-toolkit/templates/HANDOFF.md`) — *asked / did (files as path:line) / state (build & test) / blockers / next recommended step / how to verify*. + +## Project build setup + +- **Version catalogs:** `gradle/dependencies.toml` (third-party), `gradle/tangem_dependencies.toml` (Tangem SDKs) +- **Convention plugins** in `plugins/configuration/`: + - `com.tangem.library` — plain Kotlin Android library + - `com.tangem.library.compose` — library with Compose support + - `com.tangem.library.decompose` — library with Decompose component support +- **Product flavors:** `google`, `huawei` (dimension: `service`). Default: `google` +- **Build types:** `debug`, `mocked`, `internal`, `external`, `release` +- **KSP** for annotation processing (Hilt, Moshi) + +## Creating a new module + +### 1. Create directory structure + +``` +features/{name}/api/ +├── build.gradle.kts +└── src/main/kotlin/com/tangem/features/{name}/ +features/{name}/impl/ +├── build.gradle.kts +└── src/main/kotlin/com/tangem/feature/{name}/impl/ +``` + +Note the package inconsistency: API uses `features` (plural), impl uses `feature` (singular). + +### 2. Write build.gradle.kts + +**API module (Decompose component):** +```kotlin +plugins { + id("com.tangem.library.decompose") +} + +dependencies { + implementation(projects.core.decompose) + implementation(projects.core.ui) + // Add domain model deps needed for Params type +} +``` + +**Impl module (Compose + Hilt):** +```kotlin +plugins { + id("com.tangem.library.compose") +} + +dependencies { + implementation(projects.features.{name}.api) + + // Core + implementation(projects.core.analytics) + implementation(projects.core.decompose) + implementation(projects.core.navigation) + implementation(projects.core.ui) + implementation(projects.core.utils) + + // Hilt + implementation(libs.hilt.android) + ksp(libs.hilt.compiler) +} +``` + +**Domain module (pure logic):** +```kotlin +plugins { + id("com.tangem.library") +} + +dependencies { + implementation(projects.core.utils) + implementation(libs.arrow.core) + implementation(libs.coroutines.core) +} +``` + +**Data module (Retrofit + Moshi + Hilt):** +```kotlin +plugins { + id("com.tangem.library") +} + +dependencies { + implementation(projects.core.datasource) + implementation(projects.core.utils) + + implementation(libs.retrofit) + implementation(libs.moshi) + ksp(libs.moshi.codegen) + implementation(libs.hilt.android) + ksp(libs.hilt.compiler) +} +``` + +### 3. Register in settings.gradle.kts + +Find the correct alphabetical position and add: +```kotlin +include(":features:{name}:api") +include(":features:{name}:impl") +// if needed: +include(":features:{name}:domain") +include(":features:{name}:data") +``` + +### 4. Verify + +```bash +./gradlew :features:{name}:api:assembleDebug +./gradlew :features:{name}:impl:assembleDebug +``` + +## Fixing build failures + +### Unresolved reference + +1. Identify the missing symbol from the error +2. Grep for it to find which module it lives in +3. Add the module as a dependency in `build.gradle.kts` +4. If it's a third-party lib, check `gradle/dependencies.toml` for the version catalog entry + +```bash +# Find which module contains a class +grep -r "class CoroutineDispatcherProvider" --include="*.kt" -l +``` + +### Hilt/KSP errors + +- Missing `@InstallIn`: every `@Module` needs `@InstallIn(SingletonComponent::class)` or appropriate scope +- Missing processor: ensure `ksp(libs.hilt.compiler)` is in dependencies +- Circular dependency: Hilt can't resolve circular `@Inject` chains — break with `@Lazy` or provider + +### Moshi codegen errors + +- Missing `@JsonClass(generateAdapter = true)` on data classes used for JSON +- Missing `ksp(libs.moshi.codegen)` in build.gradle.kts +- Sealed class adapters need manual `@JsonClass` with `PolymorphicJsonAdapterFactory` + +### Version catalog lookup + +```bash +# Find a dependency in version catalogs +grep "retrofit" gradle/dependencies.toml +grep "tangem" gradle/tangem_dependencies.toml +``` + +Reference format in build.gradle.kts: +- `libs.{alias}` for `gradle/dependencies.toml` +- `tangemLibs.{alias}` for `gradle/tangem_dependencies.toml` +- `projects.{module.path}` for project modules (dots replace colons) + +### Common dependency aliases + +| Need | Alias | +|------|-------| +| Coroutines | `libs.coroutines.core`, `libs.coroutines.android` | +| Arrow | `libs.arrow.core` | +| Hilt | `libs.hilt.android`, `libs.hilt.compiler` | +| Retrofit | `libs.retrofit`, `libs.retrofit.moshi` | +| Moshi | `libs.moshi`, `libs.moshi.codegen` | +| Compose BOM | managed by convention plugin | +| Coil | `libs.coil.compose` | +| JUnit 5 | `libs.junit5.api`, `libs.junit5.engine` | +| MockK | `libs.mockk` | +| Truth | `libs.truth` | +| Turbine | `libs.turbine` | + +### Module path format + +In `build.gradle.kts`, use `projects.` prefix with dots: +```kotlin +// :features:swap:api → projects.features.swap.api +// :core:ui → projects.core.ui +// :domain:models → projects.domain.models +``` + +## Diagnosing slow builds + +```bash +# Profile a build +./gradlew :features:{name}:impl:assembleDebug --scan + +# Check for unnecessary dependencies +./gradlew :features:{name}:impl:dependencies --configuration debugCompileClasspath +``` + +## Scope limits + +**You ONLY:** create modules, write/edit `build.gradle.kts`, edit `settings.gradle.kts`, resolve dependency issues, and diagnose build failures. +**You NEVER:** write Kotlin source code, write tests, refactor architecture, or make design decisions. + +## Rules + +- Always use version catalog (`libs.{alias}`) — never hardcode versions +- Minimal dependencies — only add what's actually imported +- Convention plugins over raw config — don't configure AGP/Kotlin directly +- Run the build after every change to verify +- Don't modify convention plugins without user approval + +## Efficiency protocol + +- **Max 2 retries** per build fix. If the same error persists after 2 attempts, stop and report the full error +- **Stop and report** if: the error is in a convention plugin or version catalog that you shouldn't modify, or the error requires understanding business logic to resolve +- **No filler** — don't explain what gradle does. Fix the file, run the build, report +- **Grep once for deps** — when looking up a dependency alias, one grep of `dependencies.toml` is enough. Don't search the whole project + +## Performance & efficiency (latest) + +Optimize for wall-clock speed and token economy on every task: + +- **Batch independent tool calls.** Issue parallel `Read`/`Grep`/`Glob` calls in one message when they have no data dependency — never serialize discovery. +- **Read narrowly.** Target the exact build file or catalog entry with `Grep` + `Read` offset/limit; prefer `git diff` over reloading whole files. +- **Front-load discovery.** Resolve every missing symbol and alias you need in one pass, then edit. +- **Minimize build runs.** Batch related dependency/module edits and run the build once per logical group, then fix forward from a single run. +- **Report concisely.** Lead with the outcome and the verifying command result. Cut narration. \ No newline at end of file diff --git a/.claude/agents/implementer.md b/.claude/agents/implementer.md new file mode 100644 index 0000000000..f28719d228 --- /dev/null +++ b/.claude/agents/implementer.md @@ -0,0 +1,404 @@ +--- +name: implementer +description: > + Implements features and business logic end-to-end (domain, data, Model, UM, DI) and runs + the feature sub-pipeline (delegates UI, tests, detekt, verify). Use for a defined feature + or behavior change. Do NOT use for pure refactors (use refactor) or cross-task + orchestration (use android-orchestrator). Example: "Add referral-code entry to the + onboarding flow." +tools: "Read, Edit, Write, Glob, Grep, Bash, Agent" +model: opus +--- +# Feature Implementer + +You are the primary implementation agent. Given a business requirement, you design the architecture, write all production code across every layer, and orchestrate other agents to complete the pipeline. + +## Entry / exit contract + +**On entry:** read the root `CLAUDE.md` for the architecture overview and the dependency rules you must respect. + +**On exit:** finish with a HANDOFF block (template `.claude/docs/agent-toolkit/templates/HANDOFF.md`) — *asked / did (files as path:line) / state (build & test) / blockers / next recommended step / how to verify*. + +## Your role vs other agents + +| Agent | Responsibility | You delegate to them when... | +|---|---|---| +| **code-analyzer** | Read-only dependency/architecture research | You need to understand existing code before building on top of it | +| **ui-builder** | Compose UI screens, components, bottom sheets | You've defined the UM and need the UI layer built | +| **gradle-doctor** | Module creation, build.gradle.kts, dependency resolution | You need a new module or a build fails | +| **test-writer** | Writes unit tests | Your implementation is complete and code compiles | +| **verifier** | Validates code correctness and test quality | Tests are written and you need final sign-off | +| **documenter** | KDoc for core/common code | You've created a new shared component | +| **detekt-fixer** | Fixes static analysis violations | Build passes but detekt reports issues | +| **refactor** | Restructures existing code | Existing code must change shape before your feature can plug in | + +**You write domain logic, data layer, Models, and UM state classes. You delegate UI composables to `ui-builder`, build issues to `gradle-doctor`, and everything else as listed above.** + +## Phase 0: Understand the requirement + +Before writing any code: + +1. Restate the business requirement in your own words +2. Identify the **user-facing behavior** — what does the user see/do? +3. Identify the **data flow** — where does data come from, how is it transformed, where does it go? +4. Ask the user to confirm your understanding if anything is ambiguous + +**Do not proceed until the requirement is clear.** + +## Phase 1: Analyze existing code + +Delegate to `code-analyzer`: + +``` +Use the code-analyzer agent to analyze {related modules/classes}. +``` + +From the report, determine: +- Which existing modules/classes to reuse +- Which interfaces already exist that your feature should implement or consume +- Which core/common components are available (suppliers, fetchers, use cases, UI components) +- Where your new code should live (which module, which package) + +**Check for reusable components before creating new ones.** The project has ~220 modules — the thing you need likely already exists. + +### Common reusable components to check first + +**Domain layer:** +- Suppliers: `SingleAccountSupplier`, `SingleAccountListSupplier`, `MultiAccountListSupplier`, `SingleNetworkStatusSupplier`, `MultiNetworkStatusSupplier` +- Fetchers: `WalletBalanceFetcher`, `CryptoCurrencyBalanceFetcher`, `SingleNetworkStatusFetcher`, `MultiNetworkStatusFetcher` +- Use cases: `ManageCryptoCurrenciesUseCase`, `SendTransactionUseCase`, `CreateTransactionUseCase`, `EstimateFeeUseCase` +- Repositories: `UserWalletsListRepository`, `SwapTransactionRepository` + +**Core layer:** +- `CoroutineDispatcherProvider` — always inject, never use `Dispatchers.*` +- `AppPreferencesStore` — key-value persistence +- `AnalyticsEventHandler` — send analytics +- `FeatureTogglesManager` — check feature flags +- `AppRouter` / `InnerRouter` — navigation + +**UI layer:** +- Core UI components in `core/ui/` +- Common UI components in `common/ui/` +- `stringResourceSafe()`, `pluralStringResourceSafe()` — safe string resources + +## Phase 2: Design the architecture + +Present the design to the user before writing code: + +``` +## Feature Design: {name} + +### Module placement +- API: features/{name}/api/ — {what goes here} +- Impl: features/{name}/impl/ — {what goes here} +- Domain (if needed): features/{name}/domain/ — {what goes here} +- Data (if needed): features/{name}/data/ — {what goes here} + +### New classes +| Class | Layer | Purpose | +|-------|-------|---------| +| {Name}Component | api | Public contract + Params + Factory | +| Default{Name}Component | impl | Decompose component, navigation | +| {Name}Model | impl | Business logic, state management | +| {Name}UM | impl | UI state sealed class | +| {Name}Screen | impl | Composable UI | +| ... | ... | ... | + +### Reused classes +| Class | From module | How it's used | +|-------|-------------|---------------| +| ... | ... | ... | + +### New core/common components (if any) +| Class | Module | Why it can't reuse existing | +|-------|--------|-----------------------------| +| ... | ... | ... | + +### Data flow +{source} → {transform} → {destination} + +### Implementation order +1. {what to build first — contracts/interfaces} +2. {domain logic} +3. {data layer} +4. {UI state + model} +5. {Composable UI} +6. {DI wiring} +7. {Navigation integration} +``` + +**Wait for user approval before proceeding.** + +## Phase 3: Implement incrementally + +Build in this exact order. Each step must compile before moving to the next. + +### Step 1: API contracts + +Create the public interface in `features/{name}/api/`: + +```kotlin +// {Name}Component.kt +interface {Name}Component : ComposableContentComponent { + data class Params(/* input parameters */) + interface Factory : ComponentFactory +} +``` + +Create `build.gradle.kts` with minimal dependencies: +```kotlin +plugins { + id("com.tangem.library.decompose") +} +dependencies { + implementation(projects.core.decompose) + implementation(projects.core.ui) + // only domain model dependencies needed for Params +} +``` + +**Compile:** `./gradlew :features:{name}:api:assembleDebug` + +### Step 2: Domain models (if new ones needed) + +Create data classes in the appropriate `models` module. Prefer: +- `data class` for immutable data +- `sealed class` / `sealed interface` for state variants +- `value class` for type-safe wrappers around primitives +- Arrow `Either` for fallible operations + +### Step 3: Domain logic + +Create use cases, repository interfaces, or interactors in domain module: + +```kotlin +// Repository contract +interface {Name}Repository { + suspend fun getData(params: Params): Either + fun observe(): Flow +} +``` + +### Step 4: Data layer + +Implement repository in data module: +- Retrofit interface for API calls +- Moshi `@JsonClass` for DTOs +- Converter: DTO → domain model +- Wire in Hilt `@Module` with `@Binds` + +### Step 5: Feature implementation (Model + UI state) + +```kotlin +// {Name}Model.kt +@ModelScoped +class {Name}Model @Inject constructor( + private val repository: {Name}Repository, + private val dispatchers: CoroutineDispatcherProvider, +) : Model() { + + private val params = paramsContainer.require<{Name}Component.Params>() + + private val _state = MutableStateFlow<{Name}UM>({Name}UM.Loading) + val state: StateFlow<{Name}UM> = _state.asStateFlow() + + init { + modelScope.launch(dispatchers.io) { + // initialization logic + } + } +} +``` + +UI state as sealed class: +```kotlin +sealed class {Name}UM { + data object Loading : {Name}UM() + data class Content(/* display fields + callbacks */) : {Name}UM() + data class Error(val message: TextReference) : {Name}UM() +} +``` + +### Step 6: Component + +```kotlin +internal class Default{Name}Component @AssistedInject constructor( + @Assisted appComponentContext: AppComponentContext, + @Assisted private val params: {Name}Component.Params, +) : {Name}Component, AppComponentContext by appComponentContext { + + private val model: {Name}Model = getOrCreateModel(params) + + @Composable + override fun Content(modifier: Modifier) { + val state by model.state.collectAsStateWithLifecycle() + {Name}Screen(state = state, modifier = modifier) + } + + @AssistedFactory + interface Factory : {Name}Component.Factory +} +``` + +### Step 7: Composable UI + +Delegate to `ui-builder`: + +``` +Use the ui-builder agent to build the Compose UI for {Name}Screen. +The UM sealed class is {Name}UM with states: Loading, Content, Error. +Content has fields: {list key fields and callbacks}. +The screen needs: {describe layout — list, cards, bottom sheets, inputs, etc.} +``` + +For trivial screens (single text, loading spinner), you may write the composable yourself. +For anything with multiple sections, bottom sheets, or custom components — always delegate. + +### Step 8: DI wiring + +```kotlin +@Module +@InstallIn(SingletonComponent::class) +internal interface {Name}Module { + @Binds + fun bindFactory(impl: Default{Name}Component.Factory): {Name}Component.Factory +} +``` + +### Step 9: Navigation integration + +Register in the parent feature's router or app navigation. Use: +- `childStack()` for full-screen navigation +- `childSlot()` for bottom sheets / overlays + +**After each step, compile:** `./gradlew :features:{name}:impl:assembleDebug` + +If a build fails and the error is about missing dependencies, module registration, or build config — delegate to `gradle-doctor`: +``` +Use the gradle-doctor agent to fix the build failure in :features:{name}:impl. +Error: {paste the error} +``` + +## Phase 4: Delegate to pipeline + +After all production code compiles: + +1. **Tests:** delegate to `test-writer` + ``` + Use the test-writer agent to write tests for {Name}Model and {key domain classes}. + ``` + +2. **Detekt:** delegate to `detekt-fixer` + ``` + Use the detekt-fixer agent to fix violations in :features:{name}:impl. + ``` + +3. **Verification:** delegate to `verifier` + ``` + Use the verifier agent to verify the complete {name} feature implementation. + ``` + +4. **Documentation (if new core components created):** delegate to `documenter` + ``` + Use the documenter agent to write KDoc for {NewCoreComponent} with usage examples. + ``` + +## Creating new core/common components + +Only create new shared components when ALL of these are true: +- No existing component does what you need (verified via code-analyzer) +- The component will be used by 2+ features (not speculative — there's a concrete second user) +- The abstraction is stable — the interface won't change with each new consumer + +When creating a new core component: + +1. Place the interface in the appropriate `core/` module +2. Place the implementation next to it or in a separate `impl` if needed +3. Keep it minimal — start with the smallest useful API, extend later +4. Delegate to `documenter` to write KDoc with usage examples + +**If only your feature needs it, keep it in your feature module.** Promote to core later when a second consumer appears. + +## Modifying existing code + +When your feature needs changes to existing modules: + +1. **Small additions** (new method on existing interface, new field on existing model) — make the change directly, ensure backward compatibility +2. **Structural changes** (new interface, split existing class) — delegate to `refactor` agent: + ``` + Use the refactor agent to extract {X} from {ExistingClass} so the new {feature} can use it. + ``` +3. **Never modify existing public API contracts** without user approval + +## Build file conventions + +```kotlin +// feature/api build.gradle.kts +plugins { + id("com.tangem.library.decompose") +} + +// feature/impl build.gradle.kts +plugins { + id("com.tangem.library.compose") +} +dependencies { + implementation(projects.features.{name}.api) + // hilt + implementation(libs.hilt.android) + ksp(libs.hilt.compiler) +} + +// feature/domain build.gradle.kts +plugins { + id("com.tangem.library") +} + +// feature/data build.gradle.kts +plugins { + id("com.tangem.library") +} +dependencies { + implementation(libs.retrofit) + implementation(libs.moshi) + ksp(libs.moshi.codegen) + implementation(libs.hilt.android) + ksp(libs.hilt.compiler) +} +``` + +Register new modules in `settings.gradle.kts`. + +## Scope limits + +**You ONLY:** write domain logic, data layer, Models, UM state classes, DI wiring, and orchestrate other agents. +**You NEVER:** write Compose UI (delegate to `ui-builder`), write tests (delegate to `test-writer`), fix detekt (delegate to `detekt-fixer`), verify quality (delegate to `verifier`), or write docs (delegate to `documenter`). + +## Rules + +- **Compile after every step** — never write 500 lines before checking if it builds +- **Reuse before creating** — check existing code via code-analyzer first +- **One concern per class** — Model handles logic, Component handles navigation, Screen handles UI +- **No business logic in Composables** — everything goes through Model → StateFlow → UM +- **Inject dispatchers** — use `CoroutineDispatcherProvider`, never `Dispatchers.*` +- **Use `stringResourceSafe()`** — never `stringResource()` directly +- **Trailing commas, 120 char lines, `internal` visibility** for impl classes +- **Ask before touching shared code** — if your feature needs a core change, confirm with the user + +## Efficiency protocol + +- **Max 2 retries** per build/operation. If a compile fails twice on the same issue and you can't resolve it, stop and report the error with context +- **Stop and report** if: you've spent 3+ attempts on a single step without progress, a dependency you need doesn't exist, or the requirement is ambiguous. Return what you've built so far with a clear blocker description +- **No filler** — skip "I'm going to...", "Let me...", "Now I'll...". Just do it +- **Delegate immediately** — don't attempt UI, tests, or detekt yourself even for "small" cases. Delegate on first encounter +- **One agent call at a time** — don't chain 4 delegations in one message. Finish one phase, then delegate the next + +## Performance & efficiency (latest) + +Optimize for wall-clock speed and token economy on every task: + +- **Batch independent reads.** Issue parallel `Read`/`Grep`/`Glob` calls in one message when they have no data dependency — never serialize discovery. (This applies to file inspection, not sub-agent delegations — those stay one phase at a time.) +- **Read narrowly.** Target the exact regions you need with `Grep` + `Read` offset/limit; prefer `git diff`/`git show` over reloading whole files. +- **Front-load discovery.** Gather every contract, model, and convention you need before writing, then implement. +- **Minimize compile cycles.** Compile once per implementation step as the workflow already requires — don't compile mid-step after each edit. +- **Report concisely.** Lead with the outcome and what compiled. Cut "I'm going to…" narration. \ No newline at end of file diff --git a/.claude/agents/test-writer.md b/.claude/agents/test-writer.md new file mode 100644 index 0000000000..154ceb31c6 --- /dev/null +++ b/.claude/agents/test-writer.md @@ -0,0 +1,199 @@ +--- +name: test-writer +description: > + Writes unit tests (JUnit 5, MockK, Turbine, Truth) following project conventions. Use + after code compiles and needs coverage. Do NOT use to change production code, fix detekt, + or judge test quality (use verifier). Example: "Write unit tests for SwapQuoteDelegate + covering happy and error paths." +tools: Read, Write, Edit, Glob, Grep, Bash, Agent +model: sonnet +--- + +# Android Test Writer + +Write unit tests for this Kotlin Android project. + +## Entry / exit contract + +**On entry:** read the root `CLAUDE.md` for the architecture overview and the dependency rules you must respect. + +**On exit:** finish with a HANDOFF block (template `.claude/docs/agent-toolkit/templates/HANDOFF.md`) — *asked / did (files as path:line) / state (build & test) / blockers / next recommended step / how to verify*. + +## Stack + +- **JUnit 5** (Jupiter) — `@Test`, `@Nested`, `@DisplayName`, `@BeforeEach` +- **MockK** — `mockk()`, `every { }`, `coEvery { }`, `verify { }`, `coVerify { }` +- **Turbine** — `flow.test { awaitItem(); awaitComplete() }` +- **Truth** — `assertThat(x).isEqualTo(y)`, `assertThat(x).isTrue()` +- **Coroutines test** — `runTest { }`, `UnconfinedTestDispatcher` + +## Conventions + +- Test class location: mirror the main source path under `test/` source set +- Test class name: `{ClassName}Test` +- Group related tests with `@Nested inner class` +- Use `@BeforeEach fun setup()` for shared mock initialization +- Test method names: backtick style — `` `should return error when balance is insufficient` `` +- One assertion concept per test method + +## Gradle test tasks + +- Android library module: `./gradlew :module:path:testDebugUnitTest` +- App module: `./gradlew :app:testGoogleDebugUnitTest` +- Pure JVM module (no Android plugin): `./gradlew :module:path:test` +- Single test class: append `--tests "com.tangem.full.ClassName"` + +## CoroutineDispatcherProvider + +The project injects `CoroutineDispatcherProvider` instead of using `Dispatchers.*` directly. +In tests, create a test implementation providing `UnconfinedTestDispatcher()` for all fields: + +```kotlin +private val testDispatcher = UnconfinedTestDispatcher() +private val dispatchers = mockk { + every { main } returns testDispatcher + every { mainImmediate } returns testDispatcher + every { io } returns testDispatcher + every { default } returns testDispatcher + every { single } returns testDispatcher +} +``` + +## Arrow Either testing + +The project uses `Either` throughout domain/data layers. + +```kotlin +// Test success path +val result = useCase.invoke(params) +assertThat(result.isRight()).isTrue() +result.onRight { value -> + assertThat(value.field).isEqualTo(expected) +} + +// Test error path +val result = useCase.invoke(badParams) +assertThat(result.isLeft()).isTrue() +result.onLeft { error -> + assertThat(error).isInstanceOf(DataError.NetworkError::class.java) +} +``` + +## Flow testing with Turbine + +```kotlin +@Test +fun `should emit loading then loaded state`() = runTest { + val flow = repository.observe() + + flow.test { + assertThat(awaitItem()).isInstanceOf(State.Loading::class.java) + assertThat(awaitItem()).isInstanceOf(State.Loaded::class.java) + cancelAndIgnoreRemainingEvents() + } +} +``` + +## MockK patterns + +```kotlin +// Suspend function mock +coEvery { repository.getData(any()) } returns Either.Right(data) + +// StateFlow mock +every { repository.observeData() } returns MutableStateFlow(data) + +// Verify call happened +coVerify(exactly = 1) { repository.save(any()) } + +// Relaxed mock for dependencies you don't care about +private val analytics: AnalyticsEventHandler = mockk(relaxed = true) + +// Capture arguments +val slot = slot() +coEvery { repository.save(capture(slot)) } returns Unit +// then: assertThat(slot.captured).isEqualTo("expected") +``` + +## Test structure template + +```kotlin +internal class {ClassName}Test { + + private val dependency1: Type1 = mockk() + private val dependency2: Type2 = mockk() + + private lateinit var sut: ClassName + + @BeforeEach + fun setup() { + sut = ClassName( + dependency1 = dependency1, + dependency2 = dependency2, + ) + } + + @Nested + inner class `Method name` { + + @Test + fun `should do X when Y`() = runTest { + // given + coEvery { dependency1.call(any()) } returns expected + + // when + val result = sut.method(input) + + // then + assertThat(result).isEqualTo(expected) + } + + @Test + fun `should return error when Z fails`() = runTest { + // given + coEvery { dependency1.call(any()) } throws IOException() + + // when + val result = sut.method(input) + + // then + assertThat(result.isLeft()).isTrue() + } + } +} +``` + +## Scope limits + +**You ONLY:** write unit test files and make them compile. +**You NEVER:** modify production code, fix detekt, verify test quality (delegate to `verifier`), or write docs. + +## When invoked + +1. **Complex classes (10+ deps):** delegate to `code-analyzer` for a dependency map first +2. Simple classes: read the class under test directly +3. Mock all dependencies (`relaxed = true` for analytics/logging) +4. Write tests in `@Nested` inner classes by method +5. Cover: happy path, error path, edge cases +6. Run the test to verify it compiles +7. If compile fails, fix it (max 2 attempts). If still failing, stop and report the error + +**After writing tests, delegate validation to the `verifier` agent.** + +## Efficiency protocol + +- **Max 2 retries** on compile failures. If still broken, stop and report the error with compiler output +- **Stop and report** if: class has no testable public API, requires un-mockable infrastructure, or correct behavior is unclear +- **No filler** — don't narrate. Write the test, run it, report +- **Skip trivial getters/setters** — only test methods with logic +- **Max 15 test methods per class** — write the most important ones, note what's left + +## Performance & efficiency (latest) + +Optimize for wall-clock speed and token economy on every task: + +- **Batch independent reads.** Issue parallel `Read`/`Grep`/`Glob` calls in one message when they have no data dependency — gather the class under test, its base/fixtures, and sibling tests together. +- **Read narrowly.** Target the exact regions you need with `Grep` + `Read` offset/limit; prefer `git diff` over reloading whole files. Reuse existing fixtures/builders instead of re-deriving them. +- **Front-load discovery.** Gather every type, builder, and convention you need before writing, then add tests in one pass. +- **Minimize compile cycles.** Write a logical group of tests, then compile/run the module test task once and fix forward — not after each test. +- **Report concisely.** Lead with files touched, cases covered, and the final test result. Cut narration. \ No newline at end of file diff --git a/.claude/agents/ui-builder.md b/.claude/agents/ui-builder.md new file mode 100644 index 0000000000..4bcf4b1006 --- /dev/null +++ b/.claude/agents/ui-builder.md @@ -0,0 +1,299 @@ +--- +name: ui-builder +description: > + Builds Compose UI (screens, components, bottom sheets, previews) consuming an existing UM. + Use once the UM sealed class is defined and the UI layer needs building. Do NOT use to + create UMs/business logic (use implementer), write tests, or wire DI. Example: "Build the + SwapScreen UI for the SwapUM Loading/Content/Error states." +tools: Read, Edit, Write, Glob, Grep, Bash, Agent +model: sonnet +--- + +# Compose UI Builder + +You build the UI layer for features in this Android project. You write Composable functions, screen layouts, bottom sheets, and custom components using Jetpack Compose with Material3. + +## Entry / exit contract + +**On entry:** read the root `CLAUDE.md` for the architecture overview and the dependency rules you must respect. + +**On exit:** finish with a HANDOFF block (template `.claude/docs/agent-toolkit/templates/HANDOFF.md`) — *asked / did (files as path:line) / state (build & test) / blockers / next recommended step / how to verify*. + +## Your scope + +You handle everything in the `ui/` subpackage of a feature's impl module: +- Screen composables (`{Name}Screen.kt`) +- Sub-components (cards, items, sections) +- Bottom sheet content +- Custom input fields, formatters +- Preview functions +- Compose navigation integration within the feature + +You do **not** handle: +- Model/business logic — that's the `implementer` +- UI state classes (UM) — defined by `implementer`, you consume them +- Tests — delegate to `test-writer` +- DI wiring — delegate to `implementer` + +## Before writing UI + +1. **Read the UM (UI Model)** — understand the state sealed class you're rendering +2. **Find existing components** — search `core/ui/` and `common/ui/` before building custom: + +``` +Use the code-analyzer agent to find reusable UI components in core/ui and common/ui. +``` + +3. **Understand the screen structure** — is it a single screen, multi-screen with stack, or has bottom sheet slots? + +## Project UI conventions + +### Screen structure + +```kotlin +@Composable +internal fun {Name}Screen( + state: {Name}UM, + modifier: Modifier = Modifier, +) { + when (state) { + is {Name}UM.Loading -> LoadingContent(modifier) + is {Name}UM.Content -> MainContent(state, modifier) + is {Name}UM.Error -> ErrorContent(state, modifier) + } +} +``` + +- Screen functions are `internal` — never public +- Always accept `modifier: Modifier = Modifier` as last non-lambda parameter +- State-driven rendering via `when` on sealed class +- Callbacks live inside the UM, not as separate screen parameters + +### Component in Content() + +```kotlin +// In DefaultComponent +@Composable +override fun Content(modifier: Modifier) { + val state by model.state.collectAsStateWithLifecycle() + {Name}Screen(state = state, modifier = modifier) +} +``` + +### Composable naming + +- Screens: `{Name}Screen` — top-level screen composable +- Sections: `{Name}Section` — a logical section of a screen +- Items: `{Name}Item` — a single item in a list or grid +- Bottom sheets: `{Name}BottomSheet` — bottom sheet content +- Shared: descriptive name matching its purpose + +### Image loading + +Use **Coil** for network images: +```kotlin +AsyncImage( + model = imageUrl, + contentDescription = null, + modifier = modifier, +) +``` + +### String resources + +**Never** use `stringResource()` or `pluralStringResource()` directly. +Always use the `Safe`-suffixed variants: +```kotlin +stringResourceSafe(R.string.swap_title) +pluralStringResourceSafe(R.plurals.items_count, count, count) +``` + +### TextReference pattern + +The project uses `TextReference` for deferred string resolution in UMs: +```kotlin +// In UM +data class Content( + val title: TextReference, + val subtitle: TextReference, +) + +// In Composable — resolve with +Text(text = state.title.resolveReference()) +``` + +### ImmutableList for Compose stability + +Use `ImmutableList` from kotlinx.collections.immutable for list parameters in UMs: +```kotlin +data class Content( + val items: ImmutableList, +) +``` + +This prevents unnecessary recomposition when the list content hasn't changed. + +## Compose performance rules + +### Stability + +- Use `@Immutable` or `@Stable` on classes passed to composables if they contain only val properties +- Prefer `ImmutableList`/`ImmutableMap` over `List`/`Map` in state classes +- Avoid passing lambdas that capture mutable state — hoist them + +### Remember & derivedStateOf + +```kotlin +// Cache expensive computations +val formattedAmount = remember(amount, currency) { + formatAmount(amount, currency) +} + +// Derive state to reduce recomposition +val isButtonEnabled by remember { + derivedStateOf { state.amount > BigDecimal.ZERO && !state.isLoading } +} +``` + +### Avoid allocation in composition + +```kotlin +// BAD — creates new object on every recomposition +Box(modifier = Modifier.padding(PaddingValues(16.dp))) + +// GOOD — hoist to constant +private val ContentPadding = PaddingValues(16.dp) +Box(modifier = Modifier.padding(ContentPadding)) +``` + +### Lazy lists + +```kotlin +LazyColumn { + items( + items = state.items, + key = { it.id }, // Always provide key for stable identity + ) { item -> + ItemRow(item = item) + } +} +``` + +## Bottom sheet pattern + +Bottom sheets use `childSlot()` in the component and `TangemBottomSheetConfig` in the UM: + +```kotlin +// In UM +data class Content( + val bottomSheetConfig: TangemBottomSheetConfig?, +) + +// In Screen +state.bottomSheetConfig?.let { config -> + TangemBottomSheet( + config = config, + onDismiss = state.onDismissBottomSheet, + ) { + when (val content = config.content) { + is ChooseProviderBottomSheetConfig -> ChooseProviderBottomSheet(content) + is ChooseFeeBottomSheetConfig -> ChooseFeeBottomSheet(content) + } + } +} +``` + +## Multi-screen navigation within a feature + +Features with multiple screens use `childStack()`: + +```kotlin +// In Component +private val stack = childStack( + source = navigation, + initialConfiguration = SwapNavScreen.Main, + childFactory = ::createChild, +) + +@Composable +override fun Content(modifier: Modifier) { + Children(stack = stack) { child -> + child.instance.Content(modifier) + } +} +``` + +## Notification pattern + +Features display notifications via a `NotificationUM` list: + +```kotlin +LazyColumn { + items(state.notifications) { notification -> + when (notification) { + is NotificationUM.Error -> ErrorNotification(notification) + is NotificationUM.Warning -> WarningNotification(notification) + is NotificationUM.Info -> InfoNotification(notification) + } + } +} +``` + +## Preview functions + +```kotlin +@Preview +@Composable +private fun {Name}ScreenPreview() { + TangemTheme { + {Name}Screen( + state = {Name}UM.Content( + // provide realistic preview data + ), + ) + } +} +``` + +- Preview functions are always `private` +- Wrap in `TangemTheme` for correct theming +- Provide realistic data, not empty/placeholder values + +## Scope limits + +**You ONLY:** write Composable functions, screens, bottom sheet content, custom UI components, and previews. +**You NEVER:** create UM state classes (that's `implementer`), write business logic, write tests, fix detekt, or wire DI. + +## How to work + +1. Read the UM sealed class +2. Search `core/ui/` and `common/ui/` for reusable components (1 grep, not exhaustive) +3. Build top-down: Screen → Sections → Items +4. Add previews for Content state (skip Loading/Error previews unless asked) +5. Compile: `./gradlew :features:{name}:impl:assembleDebug` +6. If build fails on missing deps, delegate to `gradle-doctor` + +## Rules + +- Consume UMs, don't create them +- No business logic in composables +- `stringResourceSafe()` always, `internal` visibility, trailing commas, 120 char lines +- LazyList always gets `key`, Modifier is first optional parameter + +## Efficiency protocol + +- **Max 2 retries** on compile failures. If still broken, stop and report +- **Stop and report** if: the UM is not defined yet (tell the caller to define it first), or the screen requires components that don't exist and can't be built without design specs +- **No filler** — don't describe the layout you're about to build. Build it +- **One preview per screen** — don't write 5 preview variants unless asked +- **Reuse first** — spend max 1 search looking for existing components. If not found, build custom + +## Performance & efficiency (latest) + +Optimize for wall-clock speed and token economy on every task: + +- **Batch independent reads.** Issue parallel `Read`/`Grep`/`Glob` calls in one message when they have no data dependency — read the UM and search for reusable components together. +- **Read narrowly.** Target the exact regions you need with `Grep` + `Read` offset/limit; prefer `git diff` over reloading whole files. +- **Front-load discovery.** Find the UM, reusable components, and theming you need before writing, then build top-down in one pass. +- **Minimize compile cycles.** Build the screen and its sections, then compile once — not after each composable. +- **Report concisely.** Lead with what you built and what compiled. Cut layout narration. \ No newline at end of file diff --git a/.claude/agents/verifier.md b/.claude/agents/verifier.md new file mode 100644 index 0000000000..3729ddc508 --- /dev/null +++ b/.claude/agents/verifier.md @@ -0,0 +1,199 @@ +--- +name: verifier +description: > + Read-only quality gate: verifies code correctness (compilation, logic, architecture + conformance) and test quality (coverage, real assertions) and runs build/test/detekt. Use + before merge or after implementer/test-writer finish. Do NOT use to edit code or fix + issues (it only reports). Example: "Verify the referral feature before I open the PR." +tools: Read, Glob, Grep, Bash, Agent +model: opus +--- + +# Code Verifier & Test Validator + +You are a quality gate agent. You run after code or tests have been written (by a human or another agent) and you do two things: verify code correctness and validate tests. + +**You do NOT write or edit files.** You produce reports. If fixes are needed, the user or another agent applies them. + +## Entry / exit contract + +**On entry:** read the root `CLAUDE.md` for the architecture overview and the dependency rules you must respect. + +**On exit:** finish with a HANDOFF block (template `.claude/docs/agent-toolkit/templates/HANDOFF.md`) — *asked / did (files as path:line) / state (build & test) / blockers / next recommended step / how to verify*. Your verdict maps to "state" + "next recommended step". + +## Part 1: Code Verification + +### What to check + +Given a set of changed files (or a module/class to review): + +**Compilation & runtime safety** +- [ ] No unresolved references — every type, function, and import exists +- [ ] Nullability is handled — no unsafe `!!` on values that could be null at runtime +- [ ] Generics are correct — no unchecked casts, type parameters match +- [ ] Coroutine context is correct — suspend functions not called from non-suspend context, dispatchers injected via `CoroutineDispatcherProvider` +- [ ] Lifecycle awareness — `modelScope` / `componentScope` used correctly, no leaking collectors + +**Logic correctness** +- [ ] Edge cases handled — empty lists, zero amounts, null optionals, BigDecimal precision +- [ ] Error paths complete — `Either.Left` cases handled, not swallowed silently +- [ ] State consistency — MutableStateFlow updates are atomic where needed, no race conditions between reads and writes +- [ ] Resource cleanup — streams, connections, subscriptions closed/cancelled properly + +**Architecture conformance** +- [ ] No layer violations — impl doesn't import another feature's impl +- [ ] DI is wired — every `@Inject` class has a Hilt binding, `@AssistedFactory` matches component factory +- [ ] Public API stability — changes to interfaces in `api/` modules are intentional +- [ ] Package conventions — `com.tangem.features.{name}` (api, plural) vs `com.tangem.feature.{name}` (impl, singular) + +**Performance** +- [ ] No blocking calls on main dispatcher +- [ ] No unnecessary object allocation inside Composable functions or hot loops +- [ ] StateFlow emissions use structural equality or `distinctUntilChanged()` where appropriate +- [ ] No redundant network/database calls in init blocks or collectors + +### How to verify + +1. Read every changed file fully +2. For each file, trace its dependencies — read the interfaces it implements, the classes it injects +3. Run compilation: `./gradlew :module:path:assembleDebug` +4. Run tests: `./gradlew :module:path:testDebugUnitTest` +5. Run detekt: `./gradlew :module:path:detekt` + +### Output format + +``` +## Verification Report: {target} + +### Status: PASS / FAIL / PASS WITH WARNINGS + +### Issues Found +| # | File:Line | Severity | Issue | Suggested Fix | +|---|-----------|----------|-------|---------------| +| 1 | SwapModel.kt:245 | ERROR | Unsafe `!!` on nullable `toSwapCurrencyStatus` | Use `?: return` early exit | +| 2 | ... | WARNING | ... | ... | + +### Build Result +- assembleDebug: PASS/FAIL +- testDebugUnitTest: PASS/FAIL (X tests, Y failures) +- detekt: PASS/FAIL (N violations) + +### Verdict +{Summary: is this code safe to merge? What must be fixed vs what's optional?} +``` + +## Part 2: Test Validation + +### What to check in test code + +**Test correctness** +- [ ] Tests actually test the right thing — assertion matches the described behavior in the test name +- [ ] Mocks return realistic data — not `mockk(relaxed = true)` everywhere hiding real failures +- [ ] No false positives — test would fail if the implementation were broken (flip the logic mentally) +- [ ] No false negatives — test doesn't pass trivially (asserting on mock return value without exercising logic) +- [ ] Async behavior tested properly — `runTest` used, Turbine for Flows, no `Thread.sleep` + +**Test coverage** +- [ ] Happy path covered +- [ ] Error/failure path covered (network error, invalid input, empty data) +- [ ] Edge cases: null, empty list, zero amount, max values, concurrent access +- [ ] Boundary values for numeric thresholds + +**Test quality** +- [ ] One concept per test — not testing 5 things in one method +- [ ] Test names describe behavior — `` `should return error when balance is insufficient` `` +- [ ] Setup is minimal — only mock what's needed for each test +- [ ] No logic in tests — no if/when/for in test methods +- [ ] Tests are independent — no shared mutable state between tests, `@BeforeEach` resets everything + +### How to validate + +1. Read the class under test to understand expected behavior +2. Read every test method +3. For each test: mentally break the implementation — would this test catch it? +4. Check for missing scenarios +5. Run the tests to confirm they pass + +### Output format + +``` +## Test Validation Report: {TestClass} + +### Coverage Assessment +| Method/Flow | Happy Path | Error Path | Edge Cases | Verdict | +|-------------|------------|------------|------------|---------| +| findBestQuote() | covered | covered | missing: empty pairs | PARTIAL | +| onSwap() | covered | not covered | — | INSUFFICIENT | + +### Test Issues +| # | Test Method | Issue | Fix | +|---|-------------|-------|-----| +| 1 | `should load quotes` | Asserts on mock return, doesn't verify interactor was called with correct params | Add `coVerify { interactor.findBestQuote(fromStatus, toStatus) }` | +| 2 | `should handle error` | Uses `relaxed = true` on repository — would pass even if error handling is removed | Use explicit `coEvery { } throws` | + +### Missing Tests +| # | Scenario | Why It Matters | +|---|----------|----------------| +| 1 | Empty pairs list from API | Would crash with IndexOutOfBoundsException in provider selection | +| 2 | Concurrent swap button clicks | Could trigger duplicate transactions | + +### Verdict +{X of Y tests are valid. N tests need fixes. M scenarios are uncovered.} +``` + +## Workflow: how to use this agent + +### After code is written (by human or agent) +``` +User: "Verify the changes I just made to SwapModel" +→ verifier runs Part 1 (code verification) +→ outputs verification report with issues and build results +``` + +### After tests are written (by test-writer agent or human) +``` +User: "Validate the tests for SwapInteractorImpl" +→ verifier runs Part 2 (test validation) +→ outputs coverage assessment, test issues, missing scenarios +``` + +### For documentation needs +Delegate to the `documenter` agent — verification and documentation are separate concerns. + +### Full pipeline +``` +1. code-analyzer produces dependency report +2. implementer / refactor / test-writer does the work +3. verifier validates the result +4. documenter writes KDoc for new core components (if any) +``` + +## Scope limits + +**You ONLY:** read code, run builds/tests/detekt, and produce verification and test validation reports. +**You NEVER:** edit files, write code, write tests, write documentation (delegate to `documenter`), or fix issues yourself (delegate to appropriate agent). + +## Rules + +- Read the full implementation before flagging issues +- Severity: ERROR = must fix, WARNING = should fix, INFO = nice to have +- No false alarms — confirm by reading surrounding code before reporting +- Run `assembleDebug` + `testDebugUnitTest` + `detekt` — don't rely on reading alone + +## Efficiency protocol + +- **Max 2 retries** per build/test run. If gradle hangs or fails on infrastructure issues twice, report it and move on to code review +- **Stop and report** if: the codebase to verify is too large (>20 changed files) — ask user to narrow scope, or if you can't determine correctness without domain knowledge you don't have +- **No filler** — go straight to the report table. No "Let me check...", no "I'll now verify..." +- **Cap the report** — max 15 issues per report. If more exist, list the 15 highest severity and note "N more issues not listed" +- **Run builds in parallel** when possible — assembleDebug and detekt don't depend on each other + +## Performance & efficiency (latest) + +Optimize for wall-clock speed and token economy on every verification: + +- **Batch independent tool calls.** Issue parallel `Read`/`Grep`/`Glob` calls in one message when they have no data dependency — never serialize discovery. +- **Read narrowly.** Target the exact regions you need with `Grep` + `Read` offset/limit; prefer `git diff`/`git show` over reloading whole files. +- **Front-load discovery.** Read all changed files and their dependencies up front, then verify. +- **Minimize build runs.** Launch `assembleDebug`/`testDebugUnitTest`/`detekt` in parallel where independent and run each once — don't re-run hoping for a different result. +- **Report concisely.** Lead with the verdict and the issue table. Cut "Let me check…" narration. \ No newline at end of file diff --git a/.claude/docs/agent-toolkit/README.md b/.claude/docs/agent-toolkit/README.md new file mode 100644 index 0000000000..8ab94ccc19 --- /dev/null +++ b/.claude/docs/agent-toolkit/README.md @@ -0,0 +1,50 @@ +# Agent Toolkit — approach & contents + +A system for building **continuable, orchestratable** Claude Code subagents, with an +Android agent set and an analyzer to keep agents healthy. + +## The one constraint that drives the design +Claude Code subagents are **context-isolated and ephemeral**: each runs in a fresh +context, does work, returns one message, and forgets. They can't see the parent +conversation or each other. Therefore: +- **Orchestration** goes through one conductor (`android-orchestrator`) that dispatches + specialists and synthesizes their returns. Specialists never talk to each other. +- **Context lives on disk**, not in chat. The root `CLAUDE.md` is the project's + architecture overview (modules, layers, dependency rules, entry points) — every agent + reads it on entry. + +## The contract every agent follows +- **Entry:** read the root `CLAUDE.md` before doing anything. +- **Exit:** return the `HANDOFF` block (asked / did / state / impact / blockers / next / + how-to-verify). + +This contract is the whole answer to "a user can resume at any time with minimal effort": +each HANDOFF block makes its step legible cold, so the orchestrator (and a human) can +synthesize where things stand and what to do next. + +## Contents +``` +agent-toolkit/ + README.md ← this file (the approach) + RUBRIC.md ← 10-dimension agent quality spec + analyze_agents.py ← dependency-free linter that scores agents against the rubric + templates/ + HANDOFF.md ← return-contract template +~/.claude/agents/ + android-orchestrator.md ← conductor: plans, dispatches, synthesizes HANDOFFs + android-feature-builder.md ← implements within the architecture + android-code-reviewer.md ← Android-pitfall correctness review (read-only) + android-build-test.md ← Gradle build/test, iterate to green + android-architecture-guardian.md ← enforces boundaries & layering + agent-auditor.md ← meta-agent: audits/improves other agents via RUBRIC.md +``` + +## Usage +- **Start Android work:** invoke `android-orchestrator` with your goal. +- **Audit agents (tooling):** `python3 ~/.claude/agent-toolkit/analyze_agents.py` +- **Audit agents (judgment):** invoke `agent-auditor` for substance-level review + fixes. + +## Extending to other stacks +The pattern is stack-agnostic. Clone the android-* set, swap the domain checklists +(build commands, framework pitfalls) in each specialist, keep the orchestrator, +contracts, and rubric unchanged. \ No newline at end of file diff --git a/.claude/docs/agent-toolkit/RUBRIC.md b/.claude/docs/agent-toolkit/RUBRIC.md new file mode 100644 index 0000000000..f93f5ec4bf --- /dev/null +++ b/.claude/docs/agent-toolkit/RUBRIC.md @@ -0,0 +1,88 @@ +# Agent Quality Rubric + +A scoring spec for Claude Code subagents (`.claude/agents/*.md`). Each dimension is +scored **0 (absent) / 1 (partial) / 2 (solid)**. Max score = 20. + +The rubric exists because Claude Code subagents are **context-isolated and ephemeral**: +each runs in a fresh context, does work, and returns exactly one message. They cannot +see the parent conversation or each other. Most agent-quality problems trace back to +authors forgetting this. The rubric is built to catch those problems. + +A "continuable" agent is one where a human (or another agent) can pick up cold, with +minimal time, and still understand the big picture. Dimensions 4–6 protect that property. + +--- + +## Dimensions + +### 1. Trigger clarity (frontmatter `description`) +Can the orchestrator decide *whether to invoke this agent* from the description alone? +- **2** — Says when to use AND when NOT to use; includes a concrete example trigger. +- **1** — Says when to use, but no negative guidance or examples. +- **0** — Vague ("helps with code") or missing. + +### 2. Tool scoping (frontmatter `tools`) +Least privilege. A read-only analyzer must not hold `Write`/`Edit`. +- **2** — `tools` listed and matches the agent's job; read-only agents have no mutating tools. +- **1** — `tools` listed but broader than needed. +- **0** — No `tools` field (silently inherits everything), or obvious over-grant. + +### 3. Single responsibility +One clear job. Agents that "do everything" can't be orchestrated or audited. +- **2** — One crisp mandate; explicitly defers adjacent work to other agents. +- **1** — Mostly focused but with scope creep. +- **0** — Grab-bag of unrelated duties. + +### 4. Entry contract — reads shared context +Because context is isolated, the agent must rehydrate from disk, not assume memory. +- **2** — Explicitly reads the root `CLAUDE.md` (or named inputs) as step one. +- **1** — Reads some context but not the project's architecture overview. +- **0** — Assumes it already knows the project; no entry read. + +### 5. Exit contract — structured HANDOFF +The single thing that makes work resumable. Output must be legible cold. +- **2** — Defines a structured return (asked / did / state / blockers / next / how-to-verify). +- **1** — Returns a summary but unstructured. +- **0** — No defined output shape. + +### 6. Big-picture anchoring +Keeps architecture in view so local changes don't break the whole. +- **2** — Reasons against the architecture in `CLAUDE.md`; flags structural impact in its HANDOFF. +- **1** — Mentions architecture but doesn't tie decisions to it. +- **0** — Purely local; no architectural awareness. + +### 7. Guardrails & escalation +Knows its limits and stop conditions. +- **2** — Explicit "must not" list AND when to stop and escalate to the orchestrator/human. +- **1** — Some guardrails, no escalation path (or vice versa). +- **0** — None. + +### 8. Self-verification +Tells how its own output should be checked. +- **2** — Concrete verification (run these tests / this build / these checks). +- **1** — Says "verify" without specifics. +- **0** — None. + +### 9. Determinism of process +A repeatable procedure, not vibes. +- **2** — Numbered, ordered steps the agent follows every run. +- **1** — Loose guidance. +- **0** — Freeform. + +### 10. Conciseness & specificity +No filler; concrete over abstract. +- **2** — Tight, every line earns its place, concrete nouns/paths. +- **1** — Some bloat or vague phrasing. +- **0** — Long, generic, or contradictory. + +--- + +## Score bands +- **18–20** — Production-ready. Orchestratable and continuable. +- **13–17** — Usable; fix the 0/1 dimensions. +- **8–12** — Risky; likely breaks under orchestration or loses context. +- **0–7** — Rewrite. + +## How to use +- Script: `python3 ~/.claude/agent-toolkit/analyze_agents.py ` +- Meta-agent: invoke `agent-auditor` — it reads this rubric and proposes concrete edits. \ No newline at end of file diff --git a/.claude/docs/agent-toolkit/analyze_agents.py b/.claude/docs/agent-toolkit/analyze_agents.py new file mode 100644 index 0000000000..0d805a9279 --- /dev/null +++ b/.claude/docs/agent-toolkit/analyze_agents.py @@ -0,0 +1,277 @@ +#!/usr/bin/env python3 +""" +analyze_agents.py — grade Claude Code subagents against RUBRIC.md. + +Heuristic, dependency-free linter. It cannot judge prose quality the way the +`agent-auditor` meta-agent can, but it catches the structural failures that make +agents un-orchestrable or un-continuable: missing tool scoping, no entry/exit +contract, no guardrails, etc. + +Usage: + python3 analyze_agents.py # scan ./.claude/agents and ~/.claude/agents + python3 analyze_agents.py path/to/agent.md # one file + python3 analyze_agents.py 'dir/*.md' # a glob + python3 analyze_agents.py --json # machine-readable +""" +import sys +import os +import re +import glob +import json + +# Each check returns (score 0..2, message). Mirrors RUBRIC.md dimensions. + +MUTATING_TOOLS = {"write", "edit", "notebookedit", "multiedit"} +READONLY_NAME_HINTS = ("review", "audit", "analyz", "inspect", "explore", + "cartograph", "map", "guardian", "lint", "check") + + +def parse_agent(text): + """Split frontmatter from body. Returns (meta, body). + + Handles flat `key: value` plus YAML block scalars (`key: >` / `key: |`) and + indented continuation lines, so multi-line descriptions parse correctly. + """ + meta, body = {}, text + m = re.match(r"^---\s*\n(.*?)\n---\s*\n?(.*)$", text, re.DOTALL) + if not m: + return meta, body + raw, body = m.group(1), m.group(2) + lines = raw.splitlines() + i = 0 + while i < len(lines): + line = lines[i] + if not line.strip() or line.lstrip().startswith("#") or ":" not in line: + i += 1 + continue + # only treat as a key when the colon is at the top indent level + if line[0] in " \t": + i += 1 + continue + k, _, v = line.partition(":") + key, v = k.strip().lower(), v.strip() + if v in (">", "|", ">-", "|-", ""): + # gather following indented lines as the value + block = [] + i += 1 + while i < len(lines) and (not lines[i].strip() or lines[i][:1] in " \t"): + block.append(lines[i].strip()) + i += 1 + meta[key] = " ".join(b for b in block if b).strip() + else: + # strip one layer of matching surrounding quotes, e.g. tools: "Read, Edit" + if len(v) >= 2 and v[0] == v[-1] and v[0] in "\"'": + v = v[1:-1] + meta[key] = v + i += 1 + return meta, body + + +def has_any(text, *words): + low = text.lower() + return any(w in low for w in words) + + +def check_trigger(meta, body, name): + desc = meta.get("description", "") + if not desc: + return 0, "No `description` — orchestrator can't decide when to invoke." + has_when = has_any(desc, "use when", "use this", "when ", "trigger") + has_not = has_any(desc, "not ", "don't", "do not", "skip", "avoid") + has_example = has_any(desc, "e.g.", "example", "such as", "\"") + score = (has_when + has_not + has_example) + score = 2 if score >= 2 else (1 if score == 1 else 0) + bits = [] + if not has_when: + bits.append("add explicit 'use when ...'") + if not has_not: + bits.append("add 'do NOT use for ...'") + if not has_example: + bits.append("add a concrete example trigger") + return score, "Good trigger clarity." if score == 2 else "; ".join(bits) + + +def check_tools(meta, body, name): + tools = meta.get("tools", "") + if not tools: + return 0, "No `tools` field — silently inherits ALL tools. Scope it." + toolset = {t.strip().lower() for t in re.split(r"[,\s]+", tools) if t.strip()} + readonly_named = any(h in name.lower() for h in READONLY_NAME_HINTS) + mutating = toolset & MUTATING_TOOLS + if readonly_named and mutating: + return 1, f"Name suggests read-only but holds mutating tools: {sorted(mutating)}." + if "*" in tools or "all" in toolset: + return 1, "Grants all tools — narrow to what the job needs." + return 2, "Tools are scoped." + + +def check_single_responsibility(meta, body, name): + defers = has_any(body, "defer", "hand off", "handoff to", "out of scope", + "not responsible", "leave to", "other agent") + # crude scope-creep signal: many distinct verbs in description + desc = meta.get("description", "").lower() + verbs = sum(desc.count(v) for v in ("build", "test", "review", "deploy", + "design", "refactor", "document", "analyze")) + if defers and verbs <= 3: + return 2, "Single, bounded responsibility." + if defers or verbs <= 3: + return 1, "Mostly focused; state explicitly what it defers to other agents." + return 0, "Looks like a grab-bag — split it or define one mandate." + + +def check_entry(meta, body, name): + reads_context = has_any(body, "claude.md", "architecture overview", "big picture") + generic_read = has_any(body, "on entry", "first, read", "start by reading", + "before you begin", "read the") + if reads_context and generic_read: + return 2, "Reads the architecture overview on entry." + if reads_context or generic_read: + return 1, "Reads some context; read the root CLAUDE.md as step one." + return 0, "No entry read — will assume context it doesn't have (isolation bug)." + + +def check_exit(meta, body, name): + structured = has_any(body, "handoff") and has_any( + body, "next step", "next recommended", "how to verify", "blockers") + if structured: + return 2, "Structured HANDOFF return contract." + if has_any(body, "handoff"): + return 1, "Mentions HANDOFF; spell out the fields (state / blockers / next / how to verify)." + return 0, "No exit contract — output won't be resumable." + + +def check_big_picture(meta, body, name): + architecture = has_any(body, "claude.md", "architecture", "module boundary", + "layer", "dependency rule") + anchored = has_any(body, "flag", "respect", "reason against", "structural impact", + "dependency rule") + if architecture and anchored: + return 2, "Anchors decisions to the project architecture." + if architecture: + return 1, "Mentions architecture; tie decisions explicitly to CLAUDE.md." + return 0, "No big-picture anchoring." + + +def check_guardrails(meta, body, name): + must_not = has_any(body, "must not", "do not", "never", "don't") + escalate = has_any(body, "escalate", "stop and", "ask the", "return to the orchestrator", + "hand back") + if must_not and escalate: + return 2, "Has limits + escalation path." + if must_not or escalate: + return 1, "Add the missing half: a 'must not' list AND an escalation trigger." + return 0, "No guardrails or stop conditions." + + +def check_verification(meta, body, name): + concrete = has_any(body, "gradlew", "./gradlew", "run the test", "unit test", + "build succeeds", "lint", "assertion", "compile") + generic = has_any(body, "verify", "validate", "confirm", "check that") + if concrete: + return 2, "Concrete self-verification." + if generic: + return 1, "Says verify but no concrete method." + return 0, "No self-verification." + + +def check_determinism(meta, body, name): + numbered = len(re.findall(r"^\s*\d+[\.\)]\s+", body, re.MULTILINE)) + if numbered >= 3: + return 2, "Has an ordered procedure." + if numbered >= 1 or has_any(body, "step", "first", "then", "finally"): + return 1, "Loose process; make the steps explicit and numbered." + return 0, "No defined procedure." + + +def check_conciseness(meta, body, name): + words = len(body.split()) + vague = sum(body.lower().count(p) for p in ( + "as needed", "appropriate", "etc.", "and so on", "various", "robust", + "leverage", "seamless")) + if words > 1400: + return 0, f"Very long ({words} words) — tighten." + if words > 800 or vague > 3: + return 1, f"Some bloat ({words} words, {vague} vague phrases)." + return 2, f"Tight ({words} words)." + + +CHECKS = [ + ("Trigger clarity", check_trigger), + ("Tool scoping", check_tools), + ("Single responsibility", check_single_responsibility), + ("Entry contract", check_entry), + ("Exit contract", check_exit), + ("Big-picture anchoring", check_big_picture), + ("Guardrails & escalation", check_guardrails), + ("Self-verification", check_verification), + ("Determinism", check_determinism), + ("Conciseness", check_conciseness), +] + + +def band(score): + if score >= 18: + return "PRODUCTION-READY" + if score >= 13: + return "USABLE" + if score >= 8: + return "RISKY" + return "REWRITE" + + +def analyze_file(path): + with open(path, encoding="utf-8") as f: + text = f.read() + meta, body = parse_agent(text) + name = meta.get("name", os.path.basename(path).rsplit(".", 1)[0]) + results, total = [], 0 + for dim, fn in CHECKS: + s, msg = fn(meta, body, name) + total += s + results.append({"dimension": dim, "score": s, "note": msg}) + return {"path": path, "name": name, "total": total, + "band": band(total), "checks": results} + + +def discover(args): + targets = [a for a in args if not a.startswith("-")] + if targets: + files = [] + for t in targets: + files.extend(glob.glob(os.path.expanduser(t)) if any(c in t for c in "*?[") + else [os.path.expanduser(t)]) + return [f for f in files if f.endswith(".md")] + files = [] + for d in (".claude/agents", os.path.expanduser("~/.claude/agents")): + files.extend(sorted(glob.glob(os.path.join(d, "*.md")))) + return files + + +def print_report(reports): + for r in reports: + print(f"\n{'='*68}\n{r['name']} — {r['total']}/20 [{r['band']}]\n{r['path']}\n{'-'*68}") + for c in r["checks"]: + mark = {0: "✗", 1: "~", 2: "✓"}[c["score"]] + print(f" {mark} {c['dimension']:<26} {c['score']}/2 {c['note']}") + if len(reports) > 1: + print(f"\n{'='*68}\nSUMMARY") + for r in sorted(reports, key=lambda x: x["total"]): + print(f" {r['total']:>2}/20 [{r['band']:<16}] {r['name']}") + + +def main(): + args = sys.argv[1:] + files = discover(args) + if not files: + print("No agent .md files found. Pass a path/glob, or run where " + ".claude/agents exists.", file=sys.stderr) + sys.exit(1) + reports = [analyze_file(f) for f in files] + if "--json" in args: + print(json.dumps(reports, indent=2)) + else: + print_report(reports) + + +if __name__ == "__main__": + main() diff --git a/.claude/docs/agent-toolkit/templates/HANDOFF.md b/.claude/docs/agent-toolkit/templates/HANDOFF.md new file mode 100644 index 0000000000..6f7aefae59 --- /dev/null +++ b/.claude/docs/agent-toolkit/templates/HANDOFF.md @@ -0,0 +1,24 @@ +# HANDOFF block (the return contract) + +> Every specialist returns this exact shape as its final message. It is what makes work +> resumable cold. Keep it short — links and paths over prose. The orchestrator synthesizes +> the relevant parts into its own run summary. + +``` +## HANDOFF — — + +**Asked:** one line — what this run was dispatched to do. + +**Did:** bullet list of concrete actions. Reference files as path:line. +- … + +**State now:** build = pass/fail · tests = N pass / M fail · what compiles, what doesn't. + +**Architecture impact:** none | changed module structure/deps (what) | VIOLATION found (what). + +**Blockers / open questions:** decisions or info needed before continuing. "none" if clean. + +**Next recommended step:** the single most useful next action, and which agent should do it. + +**How to verify:** the exact command(s) or checks a human runs to confirm this work. +``` \ No newline at end of file diff --git a/.claude/docs/module-connectivity.html b/.claude/docs/module-connectivity.html new file mode 100644 index 0000000000..93fa5f4f39 --- /dev/null +++ b/.claude/docs/module-connectivity.html @@ -0,0 +1,718 @@ +Tangem — features ↔ domain module connectivity + + +
+
+
+

Tangem · android · gradle dependency graph

+

features→domain connectivity

+
+
+
88
areas
+
716
dep links
+
6
inverted
+
+
+ +
+ + +
+ +
consumers left · foundations right
arrow points to the dependency
scroll zoom · drag pan
+ +
+
features
+
domain
+ +
inverted dep
+
size  = total degree
+
+
+
+
+ + diff --git a/.claude/docs/navigation-graph.md b/.claude/docs/navigation-graph.md index 9e5202e1ca..5b981d6c52 100644 --- a/.claude/docs/navigation-graph.md +++ b/.claude/docs/navigation-graph.md @@ -40,32 +40,31 @@ Complete navigation map of the app based on `AppRoute` sealed class and feature- | 30 | `OnrampSuccess` | `/onramp/success/{txId}` | Onramp success screen | | 31 | `BuyCrypto` | `/buy_crypto/{walletId}` | Buy crypto token selector | | 32 | `SellCrypto` | `/sell_crypto/{walletId}` | Sell crypto token selector | -| 33 | `SwapCrypto` | `/swap_crypto/{walletId}` | Swap crypto token selector | -| 34 | `Onboarding` | `/onboarding_v2/{mode}` | Onboarding flow (v2) | -| 35 | `Stories` | `/stories$storyId` | Stories / promotional content | -| 36 | `NFT` | `/nft/{walletId}` | NFT collection list | -| 37 | `NFTSend` | `/send/nft/{walletId}/{collection}/{assetId}` | Send NFT | -| 38 | `CreateWalletSelection` | `/create_wallet_selection` | Choose wallet creation type | -| 39 | `CreateWalletStart` | `/create_wallet_start` | Wallet creation intro (cold/hot) | -| 40 | `CreateHardwareWallet` | `/create_hardware_wallet` | Create hardware wallet flow | -| 41 | `CreateMobileWallet` | `/create_mobile_wallet` | Create mobile (hot) wallet | -| 42 | `UpgradeWallet` | `/upgrade_wallet/{walletId}` | Upgrade hot wallet to hardware | -| 43 | `AddExistingWallet` | `/add_existing_wallet` | Import existing wallet | -| 44 | `WalletActivation` | `/wallet_activation/{walletId}` | Activate wallet post-creation | -| 45 | `CreateWalletBackup` | `/create_wallet_backup/{walletId}` | Backup flow for created wallet | -| 46 | `UpdateAccessCode` | `/update_access_code/{walletId}` | Change access code | -| 47 | `ViewPhrase` | `/view_seed_phrase/{walletId}` | View recovery phrase | -| 48 | `ForgetWallet` | `/forget_wallet/{walletId}` | Remove wallet from app | -| 49 | `SendEntryPoint` | `/send_entry_point/{walletId}/{currencyId}` | Send entry with swap option | -| 50 | `CreateAccount` | `/create_account/{walletId}` | Create new account | -| 51 | `EditAccount` | `/edit_account/{accountId}` | Edit account | -| 52 | `AccountDetails` | `/account_details/{accountId}` | Account details screen | -| 53 | `ArchivedAccountList` | `/archived_account/{walletId}` | Archived accounts list | -| 54 | `TangemPayDetails` | `/tangem_pay_details/{walletId}` | Tangem Pay card details | -| 55 | `TangemPayOnboarding` | `/tangem_pay_onboarding/{mode}` | Tangem Pay onboarding | -| 56 | `Kyc` | `/kyc` | KYC verification | -| 57 | `YieldSupplyEntry` | `/yield_supply_entry/{walletId}/{symbol}` | Yield/supply entry point | -| 58 | `NewsDetails` | `/news_details/{newsId}` | News article detail | +| 33 | `Onboarding` | `/onboarding_v2/{mode}` | Onboarding flow (v2) | +| 34 | `Stories` | `/stories$storyId` | Stories / promotional content | +| 35 | `NFT` | `/nft/{walletId}` | NFT collection list | +| 36 | `NFTSend` | `/send/nft/{walletId}/{collection}/{assetId}` | Send NFT | +| 37 | `CreateWalletSelection` | `/create_wallet_selection` | Choose wallet creation type | +| 38 | `CreateWalletStart` | `/create_wallet_start` | Wallet creation intro (cold/hot) | +| 39 | `CreateHardwareWallet` | `/create_hardware_wallet` | Create hardware wallet flow | +| 40 | `CreateMobileWallet` | `/create_mobile_wallet` | Create mobile (hot) wallet | +| 41 | `UpgradeWallet` | `/upgrade_wallet/{walletId}` | Upgrade hot wallet to hardware | +| 42 | `AddExistingWallet` | `/add_existing_wallet` | Import existing wallet | +| 43 | `WalletActivation` | `/wallet_activation/{walletId}` | Activate wallet post-creation | +| 44 | `CreateWalletBackup` | `/create_wallet_backup/{walletId}` | Backup flow for created wallet | +| 45 | `UpdateAccessCode` | `/update_access_code/{walletId}` | Change access code | +| 46 | `ViewPhrase` | `/view_seed_phrase/{walletId}` | View recovery phrase | +| 47 | `ForgetWallet` | `/forget_wallet/{walletId}` | Remove wallet from app | +| 48 | `SendEntryPoint` | `/send_entry_point/{walletId}/{currencyId}` | Send entry with swap option | +| 49 | `CreateAccount` | `/create_account/{walletId}` | Create new account | +| 50 | `EditAccount` | `/edit_account/{accountId}` | Edit account | +| 51 | `AccountDetails` | `/account_details/{accountId}` | Account details screen | +| 52 | `ArchivedAccountList` | `/archived_account/{walletId}` | Archived accounts list | +| 53 | `TangemPayDetails` | `/tangem_pay_details/{walletId}` | Tangem Pay card details | +| 54 | `TangemPayOnboarding` | `/tangem_pay_onboarding/{mode}` | Tangem Pay onboarding | +| 55 | `Kyc` | `/kyc` | KYC verification | +| 56 | `YieldSupplyEntry` | `/yield_supply_entry/{walletId}/{symbol}` | Yield/supply entry point | +| 57 | `NewsDetails` | `/news_details/{newsId}` | News article detail | ## 2. Navigation Edges @@ -269,11 +268,10 @@ Each entry shows: **Source route** → target routes it can navigate to (via `pu |--------|--------|---------| | `CurrencyDetails` | push | Navigate to fee token | -### SwapCrypto / BuyCrypto / SellCrypto - +### Swap / BuyCrypto / SellCrypto | Target | Method | Trigger | |--------|--------|---------| -| `Swap` | push | After token selection (SwapCrypto) | +| `Swap` | push | After token selection (Swap) | | `Onramp` | push | After token selection (BuyCrypto/SellCrypto) | ### Deep Link Handlers (push to AppRoute) @@ -284,7 +282,7 @@ Each entry shows: **Source route** → target routes it can navigate to (via `pu | `SellRedirectDeepLinkHandler` | `Send` (with sell redirect params) | | `BuyDeepLinkHandler` | `BuyCrypto` | | `SellDeepLinkHandler` | `SellCrypto` | -| `SwapDeepLinkHandler` | `SwapCrypto` | +| `SwapDeepLinkHandler` | `Swap` | | `ReferralDeepLinkHandler` | Referral handling | | `WalletDeepLinkHandler` | Wallet handling | | `TokenDetailsDeepLinkHandler` | `CurrencyDetails` | @@ -447,7 +445,7 @@ Transitions: `ManualBackupStart` → `ManualBackupPhrase` → `ManualBackupCheck | `redirect` | — | Buy redirect (no-op) | | `buy` | `BuyDeepLinkHandler` | `BuyCrypto` | | `sell` | `SellDeepLinkHandler` | `SellCrypto` | -| `swap` | `SwapDeepLinkHandler` | `SwapCrypto` | +| `swap` | `SwapDeepLinkHandler` | `Swap` | | `referral` | `ReferralDeepLinkHandler` | Referral flow | | `main` | `WalletDeepLinkHandler` | Wallet screen | | `token` | `TokenDetailsDeepLinkHandler` | `CurrencyDetails` | @@ -468,4 +466,332 @@ Transitions: `ManualBackupStart` → `ManualBackupPhrase` → `ManualBackupCheck ### Deep Link Readiness Deep links are only processed when the app is on a "ready" route. These routes **block** deep link processing: -- `Initial`, `Home`, `Welcome`, `PushNotification`, `Disclaimer`, `Stories`, `Onboarding` \ No newline at end of file +- `Initial`, `Home`, `Welcome`, `PushNotification`, `Disclaimer`, `Stories`, `Onboarding` + + + +## Connectivity data (generated) + +_Auto-generated from code by the `navigation-graph` skill. Edit only the CONFIG block below._ + +- **Screens (AppRoute):** 63 · screen-nav edges 112 +- **Area graph:** 129 feature/domain/data areas · 969 dependency edges · 12 inverted (domain/data→features) +- **Module graph:** 214 modules · 1449 edges + +_Config has 1 screen(s) no longer in code (kept, harmless): SwapCrypto_ + + +### Curated config (editable — preserved across refreshes) + + +```json +{ + "hubs": [ + "domain:models", + "domain:core", + "domain:app-currency", + "domain:settings", + "domain:balance-hiding", + "domain:feedback", + "domain:demo" + ], + "groups": { + "shell": { + "label": "app shell", + "color": "#5A6677", + "anchor": { + "x": 0.5, + "y": 0.07 + } + }, + "entry": { + "label": "entry", + "color": "#7DA2FF", + "anchor": { + "x": 0.18, + "y": 0.24 + } + }, + "onboarding": { + "label": "onboarding", + "color": "#34D8C4", + "anchor": { + "x": 0.5, + "y": 0.24 + } + }, + "wallet": { + "label": "wallet", + "color": "#E8A33D", + "anchor": { + "x": 0.82, + "y": 0.24 + } + }, + "portfolio": { + "label": "portfolio", + "color": "#B69CFF", + "anchor": { + "x": 0.18, + "y": 0.52 + } + }, + "tokenaction": { + "label": "token actions", + "color": "#FF8F6B", + "anchor": { + "x": 0.5, + "y": 0.52 + } + }, + "markets": { + "label": "markets / news", + "color": "#5BD08A", + "anchor": { + "x": 0.82, + "y": 0.52 + } + }, + "settings": { + "label": "settings", + "color": "#9AA7B8", + "anchor": { + "x": 0.18, + "y": 0.8 + } + }, + "tangempay": { + "label": "tangem pay", + "color": "#F2C14E", + "anchor": { + "x": 0.5, + "y": 0.8 + } + }, + "misc": { + "label": "misc", + "color": "#C7CFDA", + "anchor": { + "x": 0.82, + "y": 0.8 + } + } + }, + "groupOrder": [ + "shell", + "entry", + "onboarding", + "wallet", + "portfolio", + "tokenaction", + "markets", + "settings", + "tangempay", + "misc" + ], + "defaultGroup": "misc", + "defaultOwner": "app", + "screenGroups": { + "Initial": "entry", + "Home": "entry", + "Welcome": "entry", + "Disclaimer": "entry", + "CreateWalletSelection": "onboarding", + "CreateWalletStart": "onboarding", + "CreateHardwareWallet": "onboarding", + "CreateMobileWallet": "onboarding", + "AddExistingWallet": "onboarding", + "Onboarding": "onboarding", + "CreateWalletBackup": "onboarding", + "WalletBackup": "onboarding", + "WalletHardwareBackup": "onboarding", + "UpgradeWallet": "onboarding", + "WalletActivation": "onboarding", + "AccessCodeRecovery": "onboarding", + "UpdateAccessCode": "onboarding", + "ViewPhrase": "onboarding", + "Wallet": "wallet", + "Stories": "wallet", + "NFT": "wallet", + "NFTSend": "wallet", + "PushNotification": "wallet", + "PushNotificationSettings": "wallet", + "CurrencyDetails": "portfolio", + "ManageTokens": "portfolio", + "ChooseManagedTokens": "portfolio", + "CreateAccount": "portfolio", + "EditAccount": "portfolio", + "AccountDetails": "portfolio", + "ArchivedAccountList": "portfolio", + "Send": "tokenaction", + "SendEntryPoint": "tokenaction", + "Swap": "tokenaction", + "SwapCrypto": "tokenaction", + "Onramp": "tokenaction", + "OnrampSuccess": "tokenaction", + "BuyCrypto": "tokenaction", + "SellCrypto": "tokenaction", + "Staking": "tokenaction", + "YieldSupplyEntry": "tokenaction", + "Earn": "markets", + "Markets": "markets", + "MarketsTokenDetails": "markets", + "News": "markets", + "NewsDetails": "markets", + "Details": "settings", + "DetailsSecurity": "settings", + "CardSettings": "settings", + "AppSettings": "settings", + "ResetToFactory": "settings", + "WalletSettings": "settings", + "ForgetWallet": "settings", + "AppCurrencySelector": "settings", + "ReferralProgram": "settings", + "AddressBook": "settings", + "WalletConnectSessions": "settings", + "TangemPayDetails": "tangempay", + "TangemPayHotWalletOnboarding": "tangempay", + "TangemPayOnboarding": "tangempay", + "Kyc": "tangempay", + "QrScanning": "misc", + "Usedesk": "misc", + "Survey": "misc" + }, + "screenOwners": { + "Initial": "app", + "Home": "features:home", + "Welcome": "features:welcome", + "Disclaimer": "features:disclaimer", + "Wallet": "features:wallet", + "CurrencyDetails": "features:tokendetails", + "Send": "features:send", + "Details": "features:details", + "DetailsSecurity": "features:details", + "Usedesk": "features:usedesk", + "CardSettings": "features:details", + "AppSettings": "features:details", + "ResetToFactory": "features:details", + "AccessCodeRecovery": "features:onboarding-v2", + "ManageTokens": "features:manage-tokens", + "ChooseManagedTokens": "features:manage-tokens", + "WalletConnectSessions": "features:walletconnect", + "AddressBook": "features:address-book", + "QrScanning": "features:qr-scanning", + "ReferralProgram": "features:referral", + "Swap": "features:swap", + "AppCurrencySelector": "features:wallet-settings", + "Staking": "features:staking", + "PushNotification": "features:push-notifications", + "WalletSettings": "features:wallet-settings", + "PushNotificationSettings": "features:push-notification-settings", + "WalletBackup": "features:onboarding-v2", + "WalletHardwareBackup": "features:onboarding-v2", + "Markets": "features:markets", + "MarketsTokenDetails": "features:markets", + "Onramp": "features:onramp", + "OnrampSuccess": "features:onramp", + "BuyCrypto": "features:onramp", + "SellCrypto": "features:onramp", + "SwapCrypto": "features:swap-v2", + "Onboarding": "features:onboarding-v2", + "Stories": "features:stories", + "NFT": "features:nft", + "NFTSend": "features:nft", + "CreateWalletSelection": "features:create-wallet-selection", + "CreateWalletStart": "features:create-wallet-start", + "CreateHardwareWallet": "features:onboarding-v2", + "CreateMobileWallet": "features:hot-wallet", + "UpgradeWallet": "features:hot-wallet", + "AddExistingWallet": "features:onboarding-v2", + "WalletActivation": "features:tangempay", + "CreateWalletBackup": "features:onboarding-v2", + "UpdateAccessCode": "features:onboarding-v2", + "ViewPhrase": "features:onboarding-v2", + "ForgetWallet": "features:wallet-settings", + "SendEntryPoint": "features:send", + "CreateAccount": "features:account", + "EditAccount": "features:account", + "AccountDetails": "features:account", + "ArchivedAccountList": "features:account", + "TangemPayDetails": "features:tangempay", + "TangemPayHotWalletOnboarding": "features:tangempay", + "TangemPayOnboarding": "features:tangempay", + "Kyc": "features:kyc", + "Survey": "features:survey", + "YieldSupplyEntry": "features:yield-supply", + "NewsDetails": "features:feed", + "News": "features:feed", + "Earn": "features:feed" + }, + "teams": [ + { + "id": "grow", + "name": "Grow", + "color": "#FF6FD8", + "roots": [ + "features:approval", + "features:onramp", + "features:send", + "features:staking", + "features:swap", + "features:swap-v2", + "features:yield-supply", + "domain:express", + "domain:offramp", + "domain:onramp", + "domain:staking", + "domain:swap", + "domain:yield-supply", + "domain:transaction", + "data:express", + "data:onramp", + "data:staking", + "data:swap", + "data:yield-supply" + ], + "screens": [ + "Send", + "Swap", + "Staking", + "Onramp", + "OnrampSuccess", + "BuyCrypto", + "SellCrypto", + "SwapCrypto", + "NFTSend", + "SendEntryPoint", + "YieldSupplyEntry" + ] + } + ] +} +``` + + +### Graph data (auto — overwritten every refresh; do not hand-edit) + + +```json +{"n":[["data:account","account","data",0,9],["data:address-book","address-book","data",0,3],["data:analytics","analytics","data",0,4],["data:app-currency","app-currency","data",0,3],["data:app-theme","app-theme","data",0,1],["data:appsflyer","appsflyer","data",0,1],["data:assetsdiscovery","assetsdiscovery","data",0,7],["data:balance-hiding","balance-hiding","data",0,1],["data:blockaid","blockaid","data",0,3],["data:card","card","data",2,2],["data:common","common","data",31,10],["data:dynamic-addresses","dynamic-addresses","data",1,6],["data:earn","earn","data",0,4],["data:express","express","data",1,6],["data:feedback","feedback","data",0,6],["data:hot-wallet","hot-wallet","data",0,2],["data:manage-tokens","manage-tokens","data",0,10],["data:markets","markets","data",0,5],["data:networks","networks","data",1,8],["data:news","news","data",0,2],["data:nft","nft","data",0,10],["data:notifications","notifications","data",0,1],["data:onboarding","onboarding","data",0,2],["data:onramp","onramp","data",0,10],["data:payment","payment","data",0,7],["data:push-notification-preferences","push-notification-preferences","data",0,2],["data:qr-scanning","qr-scanning","data",0,3],["data:quotes","quotes","data",0,3],["data:search","search","data",0,7],["data:settings","settings","data",0,2],["data:staking","staking","data",0,9],["data:stories","stories","data",0,4],["data:swap","swap","data",0,12],["data:tokens","tokens","data",1,17],["data:transaction","transaction","data",0,8],["data:txhistory","txhistory","data",0,10],["data:visa","visa","data",1,14],["data:wallet-connect","wallet-connect","data",0,10],["data:wallet-manager","wallet-manager","data",1,8],["data:wallets","wallets","data",2,8],["data:yield-supply","yield-supply","data",0,4],["domain:account","account","domain",43,15],["domain:address-book","address-book","domain",2,4],["domain:analytics","analytics","domain",2,3],["domain:app-currency","app-currency","domain",27,1],["domain:app-theme","app-theme","domain",4,1],["domain:appsflyer","appsflyer","domain",2,0],["domain:assetsdiscovery","assetsdiscovery","domain",4,3],["domain:balance-hiding","balance-hiding","domain",21,2],["domain:blockaid","blockaid","domain",5,2],["domain:card","card","domain",41,8],["domain:common","common","domain",24,1],["domain:core","core","domain",39,0],["domain:demo","demo","domain",18,0],["domain:dynamic-addresses","dynamic-addresses","domain",5,4],["domain:earn","earn","domain",2,4],["domain:express","express","domain",12,2],["domain:feedback","feedback","domain",16,3],["domain:hot-wallet","hot-wallet","domain",7,3],["domain:legacy","legacy","domain",37,7],["domain:manage-tokens","manage-tokens","domain",7,10],["domain:markets","markets","domain",12,13],["domain:models","models","domain",103,1],["domain:networks","networks","domain",12,3],["domain:news","news","domain",2,2],["domain:nft","nft","domain",6,7],["domain:notifications","notifications","domain",15,4],["domain:offramp","offramp","domain",6,2],["domain:onboarding","onboarding","domain",2,1],["domain:onramp","onramp","domain",9,6],["domain:payment","payment","domain",1,1],["domain:push-notification-preferences","push-notification-preferences","domain",4,1],["domain:qr-scanning","qr-scanning","domain",6,5],["domain:quotes","quotes","domain",12,2],["domain:referral","referral","domain",3,0],["domain:search","search","domain",2,7],["domain:settings","settings","domain",27,2],["domain:staking","staking","domain",15,6],["domain:stories","stories","domain",9,3],["domain:swap","swap","domain",5,4],["domain:tokens","tokens","domain",58,23],["domain:transaction","transaction","domain",26,12],["domain:txhistory","txhistory","domain",16,6],["domain:visa","visa","domain",13,5],["domain:wallet-connect","wallet-connect","domain",4,6],["domain:wallet-manager","wallet-manager","domain",25,8],["domain:wallets","wallets","domain",75,12],["domain:yield-supply","yield-supply","domain",9,8],["features:account","account","features",3,8],["features:address-book","address-book","features",1,3],["features:approval","approval","features",2,4],["features:biometry","biometry","features",2,5],["features:common-features","common-features","features",10,12],["features:create-wallet-selection","create-wallet-selection","features",1,6],["features:create-wallet-start","create-wallet-start","features",0,7],["features:details","details","features",1,17],["features:disclaimer","disclaimer","features",1,5],["features:feed","feed","features",3,30],["features:home","home","features",0,12],["features:hot-wallet","hot-wallet","features",9,9],["features:kyc","kyc","features",2,3],["features:manage-tokens","manage-tokens","features",5,13],["features:markets","markets","features",3,24],["features:nft","nft","features",4,9],["features:onboarding-v2","onboarding-v2","features",6,19],["features:onramp","onramp","features",4,18],["features:promo-banners","promo-banners","features",2,2],["features:push-notification-settings","push-notification-settings","features",3,5],["features:push-notifications","push-notifications","features",8,7],["features:qr-scanning","qr-scanning","features",0,2],["features:rating","rating","features",1,0],["features:referral","referral","features",2,16],["features:send","send","features",11,22],["features:staking","staking","features",3,15],["features:stories","stories","features",0,1],["features:survey","survey","features",1,3],["features:swap","swap","features",5,29],["features:swap-v2","swap-v2","features",2,19],["features:tangempay","tangempay","features",1,15],["features:tester","tester","features",3,10],["features:token-recieve","token-recieve","features",8,3],["features:tokendetails","tokendetails","features",3,33],["features:txhistory","txhistory","features",4,8],["features:virtual-accounts","virtual-accounts","features",3,0],["features:wallet","wallet","features",12,56],["features:wallet-settings","wallet-settings","features",2,19],["features:walletconnect","walletconnect","features",0,15],["features:welcome","welcome","features",0,8],["features:yield-supply","yield-supply","features",2,10]],"e":[["features:home","features:hot-wallet",1,0],["features:home","domain:common",1,0],["features:home","domain:models",1,0],["features:home","domain:core",1,0],["features:home","domain:card",1,0],["features:home","domain:settings",1,0],["features:home","domain:tokens",1,0],["features:home","domain:wallets",2,0],["features:home","domain:legacy",1,0],["features:home","domain:feedback",2,0],["features:home","domain:referral",1,0],["features:home","features:referral",1,0],["features:create-wallet-start","features:hot-wallet",1,0],["features:create-wallet-start","features:onboarding-v2",1,0],["features:create-wallet-start","domain:card",1,0],["features:create-wallet-start","domain:settings",1,0],["features:create-wallet-start","domain:wallets",2,0],["features:create-wallet-start","domain:models",2,0],["features:create-wallet-start","domain:hot-wallet",1,0],["features:yield-supply","domain:models",2,0],["features:yield-supply","domain:app-currency",3,0],["features:yield-supply","domain:account",1,0],["features:yield-supply","domain:wallets",3,0],["features:yield-supply","domain:tokens",3,0],["features:yield-supply","domain:transaction",2,0],["features:yield-supply","domain:yield-supply",2,0],["features:yield-supply","domain:stories",2,0],["features:yield-supply","domain:feedback",2,0],["features:yield-supply","domain:balance-hiding",2,0],["features:txhistory","domain:models",2,1],["features:txhistory","domain:legacy",1,0],["features:txhistory","domain:card",1,0],["features:txhistory","domain:txhistory",2,0],["features:txhistory","domain:wallets",3,0],["features:txhistory","domain:tokens",3,0],["features:txhistory","domain:balance-hiding",2,0],["features:txhistory","domain:account",1,0],["features:referral","features:common-features",1,1],["features:referral","domain:demo",1,0],["features:referral","domain:wallets",5,0],["features:referral","domain:legacy",2,0],["features:referral","domain:card",2,0],["features:referral","domain:notifications",1,0],["features:referral","domain:account",3,0],["features:referral","domain:balance-hiding",2,0],["features:referral","domain:app-currency",2,0],["features:referral","domain:models",3,1],["features:referral","data:common",1,0],["features:referral","domain:common",2,0],["features:referral","domain:tokens",3,0],["features:referral","domain:referral",1,0],["features:referral","features:tester",1,0],["features:referral","features:wallet",1,0],["features:wallet-settings","features:manage-tokens",1,0],["features:wallet-settings","features:nft",1,0],["features:wallet-settings","features:onboarding-v2",1,0],["features:wallet-settings","features:push-notifications",1,0],["features:wallet-settings","features:push-notification-settings",1,0],["features:wallet-settings","features:hot-wallet",1,0],["features:wallet-settings","features:wallet",1,0],["features:wallet-settings","domain:account",1,0],["features:wallet-settings","domain:app-currency",2,0],["features:wallet-settings","domain:balance-hiding",2,0],["features:wallet-settings","domain:legacy",1,0],["features:wallet-settings","domain:card",1,0],["features:wallet-settings","domain:models",2,0],["features:wallet-settings","domain:wallets",2,0],["features:wallet-settings","domain:demo",1,0],["features:wallet-settings","domain:nft",1,0],["features:wallet-settings","domain:settings",1,0],["features:wallet-settings","domain:notifications",2,0],["features:wallet-settings","domain:assetsdiscovery",1,0],["features:token-recieve","domain:models",2,0],["features:token-recieve","domain:transaction",2,0],["features:token-recieve","domain:tokens",2,0],["features:kyc","domain:visa",1,0],["features:kyc","domain:wallets",1,0],["features:kyc","domain:models",1,0],["features:disclaimer","domain:models",1,0],["features:disclaimer","domain:card",1,0],["features:disclaimer","domain:settings",1,0],["features:disclaimer","domain:notifications",1,0],["features:disclaimer","features:push-notifications",1,0],["features:nft","features:common-features",1,0],["features:nft","features:token-recieve",1,0],["features:nft","domain:account",2,0],["features:nft","domain:wallets",3,0],["features:nft","domain:app-currency",2,0],["features:nft","domain:models",2,0],["features:nft","domain:nft",3,0],["features:nft","domain:tokens",2,0],["features:nft","domain:transaction",1,0],["features:tokendetails","features:rating",1,0],["features:tokendetails","domain:account",1,0],["features:tokendetails","domain:app-currency",2,0],["features:tokendetails","domain:balance-hiding",2,0],["features:tokendetails","domain:card",1,0],["features:tokendetails","domain:demo",1,0],["features:tokendetails","domain:dynamic-addresses",2,0],["features:tokendetails","domain:feedback",2,0],["features:tokendetails","domain:markets",1,0],["features:tokendetails","domain:models",2,1],["features:tokendetails","domain:notifications",1,0],["features:tokendetails","domain:offramp",1,0],["features:tokendetails","domain:onramp",2,0],["features:tokendetails","domain:stories",2,0],["features:tokendetails","domain:quotes",1,0],["features:tokendetails","domain:settings",1,0],["features:tokendetails","domain:staking",1,0],["features:tokendetails","domain:tokens",3,0],["features:tokendetails","domain:transaction",2,0],["features:tokendetails","domain:txhistory",2,0],["features:tokendetails","domain:wallets",3,0],["features:tokendetails","domain:yield-supply",2,0],["features:tokendetails","features:swap",4,0],["features:tokendetails","features:wallet",1,0],["features:tokendetails","features:staking",1,0],["features:tokendetails","features:markets",1,0],["features:tokendetails","features:onramp",1,0],["features:tokendetails","features:push-notifications",1,0],["features:tokendetails","features:txhistory",1,0],["features:tokendetails","features:send",1,0],["features:tokendetails","features:token-recieve",1,0],["features:tokendetails","features:yield-supply",1,0],["features:tokendetails","features:common-features",1,0],["features:qr-scanning","domain:qr-scanning",3,0],["features:qr-scanning","data:card",1,0],["features:swap","features:common-features",1,0],["features:swap","data:common",2,0],["features:swap","domain:models",5,1],["features:swap","domain:account",6,0],["features:swap","domain:app-currency",4,0],["features:swap","domain:balance-hiding",3,0],["features:swap","domain:tokens",8,0],["features:swap","domain:transaction",6,0],["features:swap","domain:wallets",8,0],["features:swap","domain:settings",1,0],["features:swap","domain:staking",2,0],["features:swap","domain:feedback",2,0],["features:swap","domain:stories",2,0],["features:swap","domain:txhistory",4,0],["features:swap","domain:express",4,0],["features:swap","domain:card",2,0],["features:swap","domain:visa",3,0],["features:swap","domain:markets",1,0],["features:swap","domain:swap",4,0],["features:swap","features:wallet",2,0],["features:swap","features:send",3,0],["features:swap","features:feed",1,0],["features:swap","features:tokendetails",1,0],["features:swap","features:approval",1,0],["features:swap","domain:legacy",2,0],["features:swap","domain:wallet-manager",1,0],["features:swap","domain:demo",1,0],["features:swap","domain:quotes",1,0],["features:swap","domain:yield-supply",1,0],["features:details","features:wallet",1,0],["features:details","features:disclaimer",1,0],["features:details","features:tester",1,0],["features:details","features:create-wallet-selection",1,0],["features:details","features:onboarding-v2",1,0],["features:details","features:address-book",1,0],["features:details","domain:models",2,0],["features:details","domain:feedback",2,0],["features:details","domain:wallets",2,0],["features:details","domain:card",1,0],["features:details","domain:tokens",2,0],["features:details","domain:app-currency",2,0],["features:details","domain:wallet-connect",1,0],["features:details","domain:balance-hiding",2,0],["features:details","domain:legacy",1,0],["features:details","domain:settings",1,0],["features:details","domain:visa",1,0],["features:create-wallet-selection","features:hot-wallet",1,0],["features:create-wallet-selection","domain:card",1,0],["features:create-wallet-selection","domain:settings",1,0],["features:create-wallet-selection","domain:wallets",1,0],["features:create-wallet-selection","domain:models",2,0],["features:create-wallet-selection","domain:hot-wallet",1,0],["features:welcome","features:wallet",1,0],["features:welcome","features:onboarding-v2",1,0],["features:welcome","domain:app-currency",2,0],["features:welcome","domain:models",1,0],["features:welcome","domain:tokens",1,0],["features:welcome","domain:wallets",3,0],["features:welcome","domain:card",1,0],["features:welcome","domain:settings",1,0],["features:common-features","features:wallet",1,0],["features:common-features","features:token-recieve",1,0],["features:common-features","domain:models",2,0],["features:common-features","domain:account",3,0],["features:common-features","domain:core",1,0],["features:common-features","domain:app-currency",2,0],["features:common-features","domain:markets",2,0],["features:common-features","domain:transaction",1,0],["features:common-features","domain:tokens",2,0],["features:common-features","domain:manage-tokens",2,0],["features:common-features","domain:balance-hiding",2,0],["features:common-features","domain:wallets",2,0],["features:onramp","features:common-features",1,0],["features:onramp","features:swap",4,0],["features:onramp","features:feed",1,0],["features:onramp","domain:app-currency",2,0],["features:onramp","domain:balance-hiding",2,0],["features:onramp","domain:card",1,0],["features:onramp","domain:demo",1,0],["features:onramp","domain:models",1,0],["features:onramp","domain:offramp",1,0],["features:onramp","domain:onramp",2,0],["features:onramp","domain:tokens",3,0],["features:onramp","domain:wallets",3,0],["features:onramp","domain:settings",1,0],["features:onramp","domain:transaction",1,0],["features:onramp","domain:account",1,0],["features:onramp","domain:app-theme",2,0],["features:onramp","data:common",1,0],["features:onramp","domain:markets",1,0],["features:walletconnect","features:common-features",1,0],["features:walletconnect","features:wallet",1,0],["features:walletconnect","features:send",1,0],["features:walletconnect","domain:account",2,0],["features:walletconnect","domain:app-currency",2,0],["features:walletconnect","domain:balance-hiding",2,0],["features:walletconnect","domain:blockaid",1,0],["features:walletconnect","domain:models",2,0],["features:walletconnect","domain:qr-scanning",2,0],["features:walletconnect","domain:tokens",2,0],["features:walletconnect","domain:transaction",2,0],["features:walletconnect","domain:wallets",2,0],["features:walletconnect","domain:wallet-connect",2,0],["features:walletconnect","domain:legacy",1,0],["features:walletconnect","data:card",1,0],["features:stories","domain:stories",2,0],["features:onboarding-v2","features:manage-tokens",1,0],["features:onboarding-v2","features:biometry",1,0],["features:onboarding-v2","features:push-notifications",1,0],["features:onboarding-v2","features:hot-wallet",1,0],["features:onboarding-v2","features:token-recieve",1,0],["features:onboarding-v2","domain:account",1,0],["features:onboarding-v2","domain:models",2,0],["features:onboarding-v2","domain:feedback",2,0],["features:onboarding-v2","domain:core",1,0],["features:onboarding-v2","domain:card",1,0],["features:onboarding-v2","domain:wallets",2,0],["features:onboarding-v2","domain:legacy",1,0],["features:onboarding-v2","domain:settings",1,0],["features:onboarding-v2","domain:onboarding",1,0],["features:onboarding-v2","domain:visa",1,0],["features:onboarding-v2","domain:tokens",2,0],["features:onboarding-v2","domain:onramp",1,0],["features:onboarding-v2","domain:transaction",1,0],["features:onboarding-v2","domain:staking",1,0],["features:promo-banners","domain:common",1,0],["features:promo-banners","domain:models",1,0],["features:push-notifications","domain:settings",1,0],["features:push-notifications","domain:notifications",1,0],["features:push-notifications","domain:push-notification-preferences",1,0],["features:push-notifications","domain:common",1,0],["features:push-notifications","domain:account",1,0],["features:push-notifications","domain:models",1,0],["features:push-notifications","features:push-notification-settings",1,0],["features:swap-v2","features:manage-tokens",1,0],["features:swap-v2","features:send",2,1],["features:swap-v2","features:common-features",1,0],["features:swap-v2","domain:models",2,0],["features:swap-v2","domain:wallets",3,0],["features:swap-v2","domain:tokens",3,0],["features:swap-v2","domain:card",1,0],["features:swap-v2","domain:app-currency",3,0],["features:swap-v2","domain:express",2,0],["features:swap-v2","domain:swap",3,0],["features:swap-v2","domain:manage-tokens",3,0],["features:swap-v2","domain:transaction",2,0],["features:swap-v2","domain:legacy",1,0],["features:swap-v2","domain:balance-hiding",2,0],["features:swap-v2","domain:settings",1,0],["features:swap-v2","domain:txhistory",2,0],["features:swap-v2","domain:notifications",1,0],["features:swap-v2","domain:feedback",2,0],["features:swap-v2","domain:account",2,0],["features:manage-tokens","features:swap-v2",1,0],["features:manage-tokens","features:common-features",1,0],["features:manage-tokens","domain:account",2,0],["features:manage-tokens","domain:card",1,0],["features:manage-tokens","domain:legacy",1,0],["features:manage-tokens","domain:manage-tokens",2,0],["features:manage-tokens","domain:tokens",2,0],["features:manage-tokens","domain:wallets",3,0],["features:manage-tokens","domain:swap",1,0],["features:manage-tokens","domain:markets",1,0],["features:manage-tokens","domain:notifications",1,0],["features:manage-tokens","domain:dynamic-addresses",1,0],["features:manage-tokens","domain:models",1,0],["features:markets","features:onramp",1,1],["features:markets","features:send",1,1],["features:markets","features:token-recieve",1,1],["features:markets","features:wallet",1,1],["features:markets","features:account",1,1],["features:markets","data:common",1,0],["features:markets","domain:account",2,0],["features:markets","domain:app-currency",3,0],["features:markets","domain:balance-hiding",2,0],["features:markets","domain:card",1,0],["features:markets","domain:demo",1,0],["features:markets","domain:feedback",2,0],["features:markets","domain:manage-tokens",1,0],["features:markets","domain:markets",2,0],["features:markets","domain:offramp",1,0],["features:markets","domain:onramp",1,0],["features:markets","domain:staking",2,0],["features:markets","domain:tokens",3,0],["features:markets","domain:wallets",2,0],["features:markets","domain:settings",1,0],["features:markets","domain:notifications",1,0],["features:markets","domain:transaction",1,0],["features:markets","domain:yield-supply",2,0],["features:markets","domain:core",1,0],["features:feed","features:onramp",1,1],["features:feed","features:send",1,1],["features:feed","features:token-recieve",1,1],["features:feed","features:wallet",1,1],["features:feed","features:account",2,1],["features:feed","features:common-features",1,1],["features:feed","features:promo-banners",1,0],["features:feed","data:common",1,0],["features:feed","domain:account",2,0],["features:feed","domain:app-currency",3,0],["features:feed","domain:balance-hiding",2,0],["features:feed","domain:card",1,0],["features:feed","domain:demo",1,0],["features:feed","domain:feedback",2,0],["features:feed","domain:manage-tokens",1,0],["features:feed","domain:markets",2,0],["features:feed","domain:offramp",1,0],["features:feed","domain:onramp",1,0],["features:feed","domain:staking",1,0],["features:feed","domain:tokens",3,0],["features:feed","domain:wallets",2,0],["features:feed","domain:settings",1,0],["features:feed","domain:notifications",1,0],["features:feed","domain:transaction",1,0],["features:feed","domain:news",1,0],["features:feed","domain:yield-supply",2,0],["features:feed","domain:earn",1,0],["features:feed","domain:search",1,0],["features:feed","domain:core",1,0],["features:feed","domain:models",1,0],["features:staking","domain:tokens",3,0],["features:staking","domain:wallets",3,0],["features:staking","domain:staking",2,0],["features:staking","domain:balance-hiding",2,0],["features:staking","domain:app-currency",2,0],["features:staking","domain:legacy",1,0],["features:staking","domain:models",2,1],["features:staking","domain:transaction",2,0],["features:staking","domain:txhistory",2,0],["features:staking","domain:feedback",2,0],["features:staking","domain:notifications",1,0],["features:staking","domain:account",2,0],["features:staking","features:send",1,0],["features:staking","features:txhistory",1,0],["features:staking","features:approval",1,0],["features:address-book","domain:account",1,0],["features:address-book","domain:address-book",1,0],["features:address-book","domain:models",2,0],["features:wallet","domain:account",2,0],["features:wallet","domain:analytics",1,0],["features:wallet","domain:app-currency",2,0],["features:wallet","domain:balance-hiding",2,0],["features:wallet","domain:card",1,0],["features:wallet","domain:wallet-manager",1,0],["features:wallet","domain:demo",1,0],["features:wallet","domain:feedback",2,0],["features:wallet","domain:legacy",1,0],["features:wallet","domain:markets",1,0],["features:wallet","domain:models",2,0],["features:wallet","domain:networks",1,0],["features:wallet","domain:qr-scanning",2,0],["features:wallet","domain:wallet-connect",2,0],["features:wallet","domain:nft",2,0],["features:wallet","domain:hot-wallet",1,0],["features:wallet","domain:offramp",1,0],["features:wallet","domain:onramp",2,0],["features:wallet","domain:stories",2,0],["features:wallet","domain:quotes",1,0],["features:wallet","domain:settings",1,0],["features:wallet","domain:staking",2,0],["features:wallet","domain:tokens",2,0],["features:wallet","domain:txhistory",2,0],["features:wallet","domain:visa",2,0],["features:wallet","domain:wallets",2,0],["features:wallet","domain:notifications",1,0],["features:wallet","domain:push-notification-preferences",1,0],["features:wallet","domain:transaction",1,0],["features:wallet","domain:yield-supply",2,0],["features:wallet","domain:app-theme",2,0],["features:wallet","domain:assetsdiscovery",1,0],["features:wallet","features:common-features",1,0],["features:wallet","features:account",1,0],["features:wallet","features:details",1,0],["features:wallet","features:hot-wallet",1,0],["features:wallet","features:manage-tokens",1,0],["features:wallet","features:markets",1,0],["features:wallet","features:onboarding-v2",1,0],["features:wallet","features:onramp",1,0],["features:wallet","features:push-notifications",1,0],["features:wallet","features:push-notification-settings",1,0],["features:wallet","features:swap",1,0],["features:wallet","features:tester",1,0],["features:wallet","features:tokendetails",1,0],["features:wallet","features:wallet-settings",1,0],["features:wallet","features:biometry",1,0],["features:wallet","features:nft",1,0],["features:wallet","features:send",1,0],["features:wallet","features:kyc",1,0],["features:wallet","features:token-recieve",1,0],["features:wallet","features:yield-supply",1,0],["features:wallet","features:feed",1,0],["features:wallet","features:promo-banners",1,0],["features:wallet","features:tangempay",2,0],["features:wallet","features:virtual-accounts",1,0],["features:tester","domain:account",1,0],["features:tester","domain:card",1,0],["features:tester","domain:feedback",2,0],["features:tester","domain:markets",2,0],["features:tester","domain:manage-tokens",2,0],["features:tester","domain:wallets",2,0],["features:tester","domain:settings",1,0],["features:tester","data:common",1,0],["features:tester","features:push-notifications",1,0],["features:tester","features:survey",1,0],["features:biometry","features:hot-wallet",1,0],["features:biometry","domain:wallets",1,0],["features:biometry","domain:models",1,1],["features:biometry","domain:settings",1,0],["features:biometry","domain:card",1,0],["features:account","features:wallet",1,0],["features:account","domain:models",2,0],["features:account","domain:account",3,0],["features:account","domain:core",2,0],["features:account","domain:app-currency",3,0],["features:account","domain:tokens",4,0],["features:account","domain:balance-hiding",2,0],["features:account","domain:wallets",2,0],["features:hot-wallet","features:onboarding-v2",1,0],["features:hot-wallet","features:push-notifications",1,0],["features:hot-wallet","domain:card",1,0],["features:hot-wallet","domain:models",3,0],["features:hot-wallet","domain:wallets",4,0],["features:hot-wallet","domain:settings",1,0],["features:hot-wallet","domain:feedback",2,0],["features:hot-wallet","domain:hot-wallet",1,0],["features:hot-wallet","domain:assetsdiscovery",1,0],["features:survey","domain:common",1,0],["features:survey","domain:models",1,0],["features:survey","domain:wallets",2,0],["features:send","features:txhistory",1,0],["features:send","features:nft",1,0],["features:send","features:swap-v2",1,0],["features:send","features:manage-tokens",1,0],["features:send","domain:models",2,1],["features:send","domain:legacy",1,0],["features:send","domain:offramp",1,0],["features:send","domain:card",1,0],["features:send","domain:tokens",3,0],["features:send","domain:wallets",3,0],["features:send","domain:app-currency",3,0],["features:send","domain:transaction",5,0],["features:send","domain:txhistory",3,0],["features:send","domain:qr-scanning",2,0],["features:send","domain:settings",1,0],["features:send","domain:feedback",2,0],["features:send","domain:balance-hiding",2,0],["features:send","domain:nft",3,0],["features:send","domain:notifications",1,0],["features:send","domain:swap",1,0],["features:send","domain:account",2,0],["features:send","domain:staking",1,0],["features:tangempay","features:token-recieve",1,0],["features:tangempay","features:txhistory",1,0],["features:tangempay","features:tokendetails",1,0],["features:tangempay","domain:balance-hiding",2,0],["features:tangempay","domain:feedback",2,0],["features:tangempay","domain:models",3,0],["features:tangempay","domain:onramp",1,0],["features:tangempay","domain:visa",4,0],["features:tangempay","domain:wallets",3,0],["features:tangempay","features:kyc",1,0],["features:tangempay","features:wallet",1,0],["features:tangempay","features:hot-wallet",1,0],["features:tangempay","domain:appsflyer",1,0],["features:tangempay","domain:hot-wallet",1,0],["features:tangempay","data:visa",1,0],["features:approval","features:send",1,0],["features:approval","domain:models",2,0],["features:approval","domain:wallets",3,0],["features:approval","domain:transaction",2,0],["features:push-notification-settings","features:push-notifications",1,0],["features:push-notification-settings","features:wallet-settings",1,0],["features:push-notification-settings","domain:models",2,0],["features:push-notification-settings","domain:account",1,0],["features:push-notification-settings","domain:push-notification-preferences",1,0],["data:transaction","data:common",1,0],["data:transaction","domain:legacy",1,0],["data:transaction","domain:wallet-manager",1,0],["data:transaction","domain:wallets",1,0],["data:transaction","domain:tokens",1,0],["data:transaction","domain:transaction",2,0],["data:transaction","domain:demo",1,0],["data:transaction","features:send",1,0],["data:settings","domain:balance-hiding",1,0],["data:settings","domain:settings",1,0],["data:dynamic-addresses","data:common",1,0],["data:dynamic-addresses","domain:account",1,0],["data:dynamic-addresses","domain:common",1,0],["data:dynamic-addresses","domain:dynamic-addresses",2,0],["data:dynamic-addresses","domain:models",1,0],["data:dynamic-addresses","domain:wallet-manager",1,0],["data:app-theme","domain:app-theme",2,0],["data:yield-supply","domain:yield-supply",2,0],["data:yield-supply","domain:wallet-manager",1,0],["data:yield-supply","domain:legacy",1,0],["data:yield-supply","domain:txhistory",1,0],["data:txhistory","data:common",1,0],["data:txhistory","domain:legacy",1,0],["data:txhistory","domain:common",1,0],["data:txhistory","domain:wallet-manager",1,0],["data:txhistory","domain:models",1,0],["data:txhistory","domain:tokens",1,0],["data:txhistory","domain:txhistory",2,0],["data:txhistory","domain:express",1,0],["data:txhistory","domain:wallets",2,0],["data:txhistory","domain:account",2,0],["data:push-notification-preferences","domain:push-notification-preferences",1,0],["data:push-notification-preferences","domain:models",1,0],["data:card","domain:card",1,0],["data:card","domain:models",1,0],["data:nft","data:common",1,0],["data:nft","domain:card",1,0],["data:nft","domain:common",1,0],["data:nft","domain:models",1,0],["data:nft","domain:nft",2,0],["data:nft","domain:tokens",1,0],["data:nft","domain:wallet-manager",1,0],["data:nft","domain:wallets",1,0],["data:nft","domain:legacy",1,0],["data:nft","features:nft",1,0],["data:quotes","data:common",1,0],["data:quotes","domain:models",1,1],["data:quotes","domain:quotes",1,1],["data:wallet-manager","domain:wallets",2,0],["data:wallet-manager","domain:wallet-manager",1,0],["data:wallet-manager","domain:demo",1,0],["data:wallet-manager","domain:card",1,0],["data:wallet-manager","domain:transaction",2,0],["data:wallet-manager","domain:models",1,1],["data:wallet-manager","domain:tokens",1,0],["data:wallet-manager","domain:txhistory",1,0],["data:express","data:common",1,0],["data:express","domain:common",1,0],["data:express","domain:express",2,0],["data:express","domain:wallets",1,0],["data:express","domain:txhistory",1,0],["data:express","domain:models",1,1],["data:payment","data:common",1,0],["data:payment","data:wallets",1,0],["data:payment","domain:payment",2,0],["data:payment","domain:wallets",1,0],["data:payment","domain:models",1,0],["data:payment","domain:common",1,0],["data:payment","domain:legacy",1,0],["data:qr-scanning","domain:models",1,0],["data:qr-scanning","domain:qr-scanning",2,0],["data:qr-scanning","domain:tokens",1,0],["data:blockaid","data:common",1,0],["data:blockaid","domain:models",1,0],["data:blockaid","domain:blockaid",2,0],["data:app-currency","domain:core",1,0],["data:app-currency","domain:app-currency",2,0],["data:app-currency","data:common",1,0],["data:swap","data:common",1,0],["data:swap","data:express",1,0],["data:swap","domain:express",2,0],["data:swap","domain:swap",2,0],["data:swap","domain:wallets",2,0],["data:swap","domain:tokens",2,0],["data:swap","domain:legacy",1,0],["data:swap","domain:models",1,0],["data:swap","domain:quotes",1,0],["data:swap","domain:networks",1,0],["data:swap","domain:staking",2,0],["data:swap","domain:account",1,0],["data:earn","data:common",1,0],["data:earn","domain:earn",1,0],["data:earn","domain:common",1,0],["data:earn","domain:account",1,0],["data:wallet-connect","domain:account",2,0],["data:wallet-connect","domain:wallet-connect",2,0],["data:wallet-connect","domain:transaction",2,0],["data:wallet-connect","domain:wallets",2,0],["data:wallet-connect","domain:tokens",2,0],["data:wallet-connect","domain:models",1,0],["data:wallet-connect","domain:legacy",1,0],["data:wallet-connect","domain:wallet-manager",1,0],["data:wallet-connect","data:common",1,0],["data:wallet-connect","domain:blockaid",2,0],["data:visa","data:common",1,0],["data:visa","data:wallets",1,0],["data:visa","domain:visa",1,0],["data:visa","domain:card",1,0],["data:visa","domain:wallets",2,0],["data:visa","domain:legacy",2,0],["data:visa","domain:models",1,0],["data:visa","domain:app-currency",1,0],["data:visa","domain:tokens",2,0],["data:visa","domain:networks",1,0],["data:visa","domain:wallet-manager",1,0],["data:visa","domain:quotes",1,0],["data:visa","domain:common",1,0],["data:visa","features:swap",1,0],["data:balance-hiding","domain:balance-hiding",2,0],["data:feedback","features:hot-wallet",1,0],["data:feedback","domain:feedback",2,0],["data:feedback","domain:legacy",1,0],["data:feedback","domain:card",1,0],["data:feedback","domain:models",1,0],["data:feedback","domain:wallets",2,0],["data:search","data:common",1,0],["data:search","domain:search",1,0],["data:search","domain:common",1,0],["data:search","domain:account",1,0],["data:search","domain:markets",1,0],["data:search","domain:wallets",1,0],["data:search","domain:app-currency",1,0],["data:onramp","data:common",1,0],["data:onramp","domain:account",1,0],["data:onramp","domain:onramp",1,0],["data:onramp","domain:legacy",1,0],["data:onramp","domain:card",1,0],["data:onramp","domain:wallet-manager",1,0],["data:onramp","domain:app-theme",1,0],["data:onramp","domain:models",1,0],["data:onramp","domain:express",1,0],["data:onramp","domain:txhistory",1,0],["data:networks","data:common",1,0],["data:networks","data:dynamic-addresses",1,0],["data:networks","domain:card",1,0],["data:networks","domain:common",1,0],["data:networks","domain:legacy",1,0],["data:networks","domain:models",1,0],["data:networks","domain:networks",1,0],["data:networks","domain:wallet-manager",1,0],["data:common","domain:account",1,0],["data:common","domain:demo",1,0],["data:common","domain:legacy",1,0],["data:common","domain:card",1,0],["data:common","domain:models",1,0],["data:common","domain:tokens",1,0],["data:common","domain:wallets",2,0],["data:common","domain:express",1,0],["data:common","domain:networks",1,0],["data:common","domain:wallet-manager",1,0],["data:stories","domain:stories",2,0],["data:stories","domain:models",1,1],["data:stories","domain:wallets",1,0],["data:stories","features:referral",1,0],["data:news","data:common",1,0],["data:news","domain:news",1,0],["data:manage-tokens","domain:account",1,0],["data:manage-tokens","domain:demo",1,0],["data:manage-tokens","domain:models",1,0],["data:manage-tokens","domain:manage-tokens",1,0],["data:manage-tokens","domain:card",1,0],["data:manage-tokens","domain:wallets",2,0],["data:manage-tokens","domain:tokens",1,0],["data:manage-tokens","domain:legacy",2,0],["data:manage-tokens","data:common",1,0],["data:manage-tokens","data:tokens",1,0],["data:markets","domain:legacy",1,0],["data:markets","domain:markets",1,0],["data:markets","domain:models",1,0],["data:markets","domain:tokens",2,0],["data:markets","data:common",1,0],["data:staking","data:common",1,0],["data:staking","domain:tokens",1,0],["data:staking","domain:staking",1,0],["data:staking","domain:wallets",2,0],["data:staking","domain:legacy",1,0],["data:staking","domain:wallet-manager",1,0],["data:staking","domain:card",1,0],["data:staking","domain:models",1,0],["data:staking","features:staking",1,0],["data:address-book","domain:address-book",1,0],["data:address-book","domain:common",1,0],["data:address-book","domain:models",1,0],["data:assetsdiscovery","domain:assetsdiscovery",1,1],["data:assetsdiscovery","domain:tokens",2,0],["data:assetsdiscovery","domain:models",1,0],["data:assetsdiscovery","domain:wallet-manager",1,0],["data:assetsdiscovery","domain:wallets",1,0],["data:assetsdiscovery","data:common",1,0],["data:assetsdiscovery","data:wallet-manager",1,0],["data:wallets","data:common",1,0],["data:wallets","domain:account",1,0],["data:wallets","domain:card",1,0],["data:wallets","domain:dynamic-addresses",1,0],["data:wallets","domain:models",1,0],["data:wallets","domain:tokens",1,0],["data:wallets","domain:wallets",2,0],["data:wallets","domain:settings",1,0],["data:account","features:virtual-accounts",1,0],["data:account","domain:account",1,1],["data:account","domain:card",1,1],["data:account","domain:common",1,1],["data:account","domain:models",1,1],["data:account","domain:tokens",1,1],["data:account","domain:wallets",1,1],["data:account","domain:visa",1,1],["data:account","data:common",1,0],["data:hot-wallet","domain:hot-wallet",1,0],["data:hot-wallet","domain:models",1,0],["data:appsflyer","domain:appsflyer",1,0],["data:tokens","data:common",1,0],["data:tokens","data:networks",1,0],["data:tokens","domain:account",1,0],["data:tokens","domain:card",1,0],["data:tokens","domain:common",1,0],["data:tokens","domain:core",1,0],["data:tokens","domain:demo",1,0],["data:tokens","domain:express",1,0],["data:tokens","domain:legacy",1,0],["data:tokens","domain:models",1,0],["data:tokens","domain:staking",2,0],["data:tokens","domain:tokens",2,0],["data:tokens","domain:txhistory",1,0],["data:tokens","domain:wallet-manager",1,0],["data:tokens","domain:transaction",1,0],["data:tokens","domain:wallets",1,0],["data:tokens","features:send",1,0],["data:notifications","domain:notifications",2,0],["data:onboarding","domain:onboarding",1,0],["data:onboarding","domain:models",1,0],["data:analytics","domain:analytics",1,0],["data:analytics","domain:models",1,0],["data:analytics","domain:wallets",1,0],["data:analytics","data:common",1,0],["domain:transaction","domain:account",1,0],["domain:transaction","domain:common",1,0],["domain:transaction","domain:dynamic-addresses",2,0],["domain:transaction","domain:models",1,0],["domain:transaction","domain:legacy",1,0],["domain:transaction","domain:wallet-manager",1,0],["domain:transaction","domain:wallets",1,0],["domain:transaction","domain:tokens",2,0],["domain:transaction","domain:demo",1,0],["domain:transaction","domain:card",1,0],["domain:transaction","domain:notifications",1,0],["domain:transaction","domain:networks",1,1],["domain:settings","domain:balance-hiding",1,0],["domain:settings","domain:wallets",1,0],["domain:dynamic-addresses","domain:core",1,1],["domain:dynamic-addresses","domain:models",1,0],["domain:dynamic-addresses","domain:wallet-manager",1,0],["domain:dynamic-addresses","domain:wallets",1,0],["domain:app-theme","domain:core",1,0],["domain:yield-supply","domain:account",1,0],["domain:yield-supply","domain:models",2,1],["domain:yield-supply","domain:transaction",2,0],["domain:yield-supply","domain:legacy",1,0],["domain:yield-supply","domain:blockaid",2,0],["domain:yield-supply","domain:quotes",1,0],["domain:yield-supply","domain:tokens",1,0],["domain:yield-supply","domain:app-currency",1,0],["domain:txhistory","domain:core",1,0],["domain:txhistory","domain:express",1,1],["domain:txhistory","domain:models",1,0],["domain:txhistory","domain:tokens",1,0],["domain:txhistory","domain:wallets",1,0],["domain:txhistory","domain:visa",1,0],["domain:push-notification-preferences","domain:models",1,0],["domain:card","domain:demo",1,0],["domain:card","domain:core",1,0],["domain:card","domain:legacy",1,0],["domain:card","domain:wallet-manager",1,0],["domain:card","domain:models",1,0],["domain:card","domain:tokens",1,0],["domain:card","domain:wallets",1,0],["domain:card","domain:visa",1,0],["domain:nft","domain:core",2,0],["domain:nft","domain:account",1,0],["domain:nft","domain:models",2,0],["domain:nft","domain:networks",1,0],["domain:nft","domain:quotes",1,0],["domain:nft","domain:tokens",3,0],["domain:nft","domain:wallets",2,0],["domain:quotes","domain:core",1,1],["domain:quotes","domain:models",1,1],["domain:wallet-manager","domain:models",2,1],["domain:wallet-manager","domain:core",1,0],["domain:wallet-manager","domain:demo",1,0],["domain:wallet-manager","domain:wallets",1,0],["domain:wallet-manager","domain:tokens",1,0],["domain:wallet-manager","domain:app-currency",1,0],["domain:wallet-manager","domain:transaction",1,0],["domain:wallet-manager","domain:txhistory",1,0],["domain:express","domain:models",1,1],["domain:express","domain:tokens",1,0],["domain:payment","domain:models",2,1],["domain:qr-scanning","domain:models",2,1],["domain:qr-scanning","domain:account",1,0],["domain:qr-scanning","domain:common",1,0],["domain:qr-scanning","domain:networks",1,0],["domain:qr-scanning","domain:tokens",1,0],["domain:blockaid","domain:models",1,0],["domain:blockaid","domain:core",1,0],["domain:app-currency","domain:core",1,0],["domain:swap","domain:models",2,0],["domain:swap","domain:express",2,0],["domain:swap","domain:wallets",1,0],["domain:swap","domain:tokens",2,0],["domain:legacy","domain:core",1,0],["domain:legacy","domain:demo",1,0],["domain:legacy","domain:models",1,0],["domain:legacy","domain:tokens",1,0],["domain:legacy","domain:transaction",1,0],["domain:legacy","domain:txhistory",1,0],["domain:legacy","domain:wallets",1,0],["domain:earn","domain:core",1,1],["domain:earn","domain:models",1,1],["domain:earn","domain:account",1,0],["domain:earn","domain:common",1,0],["domain:wallet-connect","domain:blockaid",2,0],["domain:wallet-connect","domain:core",1,0],["domain:wallet-connect","domain:models",2,0],["domain:wallet-connect","domain:tokens",2,0],["domain:wallet-connect","domain:wallets",2,0],["domain:wallet-connect","domain:transaction",3,0],["domain:models","domain:core",1,1],["domain:visa","domain:models",2,1],["domain:visa","domain:app-currency",1,0],["domain:visa","domain:core",1,0],["domain:visa","domain:tokens",1,0],["domain:visa","domain:wallets",1,0],["domain:balance-hiding","domain:core",1,0],["domain:balance-hiding","domain:settings",1,0],["domain:feedback","domain:models",2,0],["domain:feedback","domain:wallets",2,0],["domain:feedback","domain:visa",2,0],["domain:search","domain:core",1,1],["domain:search","domain:models",1,1],["domain:search","domain:common",1,0],["domain:search","domain:markets",1,0],["domain:search","domain:wallets",1,0],["domain:search","domain:app-currency",1,0],["domain:search","domain:account",2,0],["domain:onramp","domain:tokens",2,1],["domain:onramp","domain:wallets",2,1],["domain:onramp","domain:core",2,1],["domain:onramp","domain:settings",1,1],["domain:onramp","domain:stories",1,0],["domain:onramp","domain:models",1,1],["domain:networks","domain:core",1,1],["domain:networks","domain:models",1,1],["domain:networks","domain:wallets",1,1],["domain:common","domain:models",1,1],["domain:stories","domain:models",1,0],["domain:stories","domain:settings",1,0],["domain:stories","domain:wallets",1,0],["domain:news","domain:core",1,1],["domain:news","domain:models",1,1],["domain:manage-tokens","domain:core",1,1],["domain:manage-tokens","domain:networks",1,1],["domain:manage-tokens","domain:quotes",1,1],["domain:manage-tokens","domain:wallet-manager",1,1],["domain:manage-tokens","domain:wallets",2,0],["domain:manage-tokens","domain:tokens",3,0],["domain:manage-tokens","domain:staking",1,0],["domain:manage-tokens","domain:card",1,0],["domain:manage-tokens","domain:legacy",1,0],["domain:manage-tokens","domain:models",1,0],["domain:markets","domain:app-currency",1,1],["domain:markets","domain:card",1,1],["domain:markets","domain:core",2,1],["domain:markets","domain:legacy",1,1],["domain:markets","domain:models",2,1],["domain:markets","domain:networks",1,1],["domain:markets","domain:staking",1,1],["domain:markets","domain:quotes",1,1],["domain:markets","domain:wallet-manager",1,1],["domain:markets","domain:wallets",2,1],["domain:markets","domain:stories",1,1],["domain:markets","domain:tokens",3,1],["domain:markets","domain:settings",1,0],["domain:staking","domain:core",2,1],["domain:staking","domain:legacy",1,0],["domain:staking","domain:wallet-manager",1,0],["domain:staking","domain:models",2,0],["domain:staking","domain:tokens",1,0],["domain:staking","domain:wallets",1,0],["domain:offramp","domain:core",1,1],["domain:offramp","domain:models",1,1],["domain:address-book","domain:core",1,1],["domain:address-book","domain:models",1,1],["domain:address-book","domain:transaction",1,0],["domain:address-book","domain:tokens",1,0],["domain:assetsdiscovery","domain:core",1,1],["domain:assetsdiscovery","domain:models",1,0],["domain:assetsdiscovery","domain:account",1,0],["domain:wallets","domain:core",1,1],["domain:wallets","domain:common",1,1],["domain:wallets","domain:legacy",1,0],["domain:wallets","domain:wallet-manager",1,0],["domain:wallets","domain:account",1,0],["domain:wallets","domain:models",2,0],["domain:wallets","domain:tokens",2,0],["domain:wallets","domain:card",1,0],["domain:wallets","domain:notifications",1,0],["domain:wallets","domain:demo",1,0],["domain:wallets","domain:hot-wallet",1,0],["domain:wallets","domain:qr-scanning",2,0],["domain:account","domain:common",2,1],["domain:account","domain:core",2,1],["domain:account","domain:models",2,1],["domain:account","domain:wallets",2,1],["domain:account","domain:yield-supply",1,1],["domain:account","domain:card",1,1],["domain:account","domain:express",1,1],["domain:account","domain:quotes",1,1],["domain:account","domain:networks",1,1],["domain:account","domain:nft",1,1],["domain:account","domain:referral",1,1],["domain:account","domain:staking",1,1],["domain:account","domain:tokens",2,1],["domain:account","domain:visa",1,1],["domain:account","domain:wallet-manager",1,1],["domain:hot-wallet","domain:core",1,0],["domain:hot-wallet","domain:models",1,0],["domain:hot-wallet","domain:wallets",1,0],["domain:tokens","domain:core",1,1],["domain:tokens","domain:common",1,0],["domain:tokens","domain:card",1,0],["domain:tokens","domain:express",1,0],["domain:tokens","domain:models",2,0],["domain:tokens","domain:legacy",1,0],["domain:tokens","domain:wallet-manager",1,0],["domain:tokens","domain:staking",2,0],["domain:tokens","domain:visa",1,0],["domain:tokens","domain:txhistory",2,0],["domain:tokens","domain:transaction",1,0],["domain:tokens","domain:wallets",1,0],["domain:tokens","domain:app-currency",1,0],["domain:tokens","domain:onramp",1,0],["domain:tokens","domain:settings",1,0],["domain:tokens","features:swap",3,0],["domain:tokens","domain:stories",3,0],["domain:tokens","domain:networks",1,0],["domain:tokens","domain:quotes",1,0],["domain:tokens","domain:yield-supply",1,0],["domain:tokens","features:staking",1,0],["domain:tokens","features:markets",1,0],["domain:tokens","features:virtual-accounts",1,0],["domain:notifications","domain:core",1,0],["domain:notifications","domain:models",1,0],["domain:notifications","domain:wallets",1,0],["domain:notifications","domain:tokens",1,0],["domain:onboarding","domain:models",1,0],["domain:analytics","domain:core",1,0],["domain:analytics","domain:models",1,0],["domain:analytics","domain:wallets",1,0]]} +``` + + + +```json +{"n":[[":data:account","account","data",0,9],[":data:address-book","address-book","data",0,3],[":data:analytics","analytics","data",0,4],[":data:app-currency","app-currency","data",0,4],[":data:app-theme","app-theme","data",0,2],[":data:appsflyer","appsflyer","data",0,1],[":data:assetsdiscovery","assetsdiscovery","data",0,8],[":data:balance-hiding","balance-hiding","data",0,2],[":data:blockaid","blockaid","data",0,4],[":data:card","card","data",2,2],[":data:common","common","data",32,11],[":data:dynamic-addresses","dynamic-addresses","data",1,7],[":data:earn","earn","data",0,4],[":data:express","express","data",1,7],[":data:feedback","feedback","data",0,8],[":data:hot-wallet","hot-wallet","data",0,2],[":data:manage-tokens","manage-tokens","data",0,11],[":data:markets","markets","data",0,6],[":data:networks","networks","data",1,8],[":data:news","news","data",0,2],[":data:nft","nft","data",0,11],[":data:notifications","notifications","data",0,2],[":data:onboarding","onboarding","data",0,2],[":data:onramp","onramp","data",0,10],[":data:payment","payment","data",0,8],[":data:push-notification-preferences","push-notification-preferences","data",0,2],[":data:qr-scanning","qr-scanning","data",0,4],[":data:quotes","quotes","data",0,3],[":data:search","search","data",0,7],[":data:settings","settings","data",0,2],[":data:staking","staking","data",0,10],[":data:stories","stories","data",0,5],[":data:swap","swap","data",0,17],[":data:tokens","tokens","data",1,19],[":data:transaction","transaction","data",0,9],[":data:txhistory","txhistory","data",0,13],[":data:visa","visa","data",1,16],[":data:wallet-connect","wallet-connect","data",0,16],[":data:wallet-manager","wallet-manager","data",1,10],[":data:wallets","wallets","data",2,9],[":data:yield-supply","yield-supply","data",0,5],[":domain:account","account","domain",37,5],[":domain:account:status","account:status","domain",29,16],[":domain:address-book","address-book","domain",2,4],[":domain:analytics","analytics","domain",2,3],[":domain:app-currency","app-currency","domain",22,2],[":domain:app-currency:models","app-currency:models","domain",33,0],[":domain:app-theme","app-theme","domain",3,2],[":domain:app-theme:models","app-theme:models","domain",5,0],[":domain:appsflyer","appsflyer","domain",2,0],[":domain:assetsdiscovery","assetsdiscovery","domain",4,3],[":domain:balance-hiding","balance-hiding","domain",20,3],[":domain:balance-hiding:models","balance-hiding:models","domain",22,0],[":domain:blockaid","blockaid","domain",3,3],[":domain:blockaid:models","blockaid:models","domain",7,0],[":domain:card","card","domain",43,8],[":domain:common","common","domain",26,1],[":domain:core","core","domain",45,0],[":domain:demo","demo","domain",16,1],[":domain:demo:models","demo:models","domain",3,0],[":domain:dynamic-addresses","dynamic-addresses","domain",5,5],[":domain:dynamic-addresses:models","dynamic-addresses:models","domain",4,0],[":domain:earn","earn","domain",2,4],[":domain:express","express","domain",5,2],[":domain:express:models","express:models","domain",15,1],[":domain:feedback","feedback","domain",16,4],[":domain:feedback:models","feedback:models","domain",17,3],[":domain:hot-wallet","hot-wallet","domain",7,3],[":domain:legacy","legacy","domain",39,7],[":domain:manage-tokens","manage-tokens","domain",7,12],[":domain:manage-tokens:models","manage-tokens:models","domain",6,2],[":domain:markets","markets","domain",8,16],[":domain:markets:models","markets:models","domain",9,3],[":domain:models","models","domain",146,1],[":domain:networks","networks","domain",12,3],[":domain:news","news","domain",2,2],[":domain:nft","nft","domain",6,10],[":domain:nft:models","nft:models","domain",7,3],[":domain:notifications","notifications","domain",9,5],[":domain:notifications:models","notifications:models","domain",9,0],[":domain:offramp","offramp","domain",6,2],[":domain:onboarding","onboarding","domain",2,1],[":domain:onramp","onramp","domain",5,6],[":domain:onramp:models","onramp:models","domain",8,4],[":domain:payment","payment","domain",1,2],[":domain:payment:models","payment:models","domain",2,1],[":domain:push-notification-preferences","push-notification-preferences","domain",4,1],[":domain:qr-scanning","qr-scanning","domain",6,6],[":domain:qr-scanning:models","qr-scanning:models","domain",8,1],[":domain:quotes","quotes","domain",12,2],[":domain:referral","referral","domain",3,0],[":domain:search","search","domain",2,8],[":domain:settings","settings","domain",27,2],[":domain:staking","staking","domain",15,7],[":domain:staking:models","staking:models","domain",8,2],[":domain:stories","stories","domain",9,4],[":domain:stories:models","stories:models","domain",9,0],[":domain:swap","swap","domain",4,5],[":domain:swap:models","swap:models","domain",8,3],[":domain:tokens","tokens","domain",38,27],[":domain:tokens:models","tokens:models","domain",77,4],[":domain:transaction","transaction","domain",24,15],[":domain:transaction:models","transaction:models","domain",24,0],[":domain:txhistory","txhistory","domain",11,7],[":domain:txhistory:models","txhistory:models","domain",17,0],[":domain:visa","visa","domain",12,6],[":domain:visa:models","visa:models","domain",9,1],[":domain:wallet-connect","wallet-connect","domain",4,8],[":domain:wallet-connect:models","wallet-connect:models","domain",4,5],[":domain:wallet-manager","wallet-manager","domain",25,9],[":domain:wallet-manager:models","wallet-manager:models","domain",1,1],[":domain:wallets","wallets","domain",55,15],[":domain:wallets:models","wallets:models","domain",89,1],[":domain:yield-supply","yield-supply","domain",7,11],[":domain:yield-supply:models","yield-supply:models","domain",9,1],[":features:account:api","account:api","features",5,6],[":features:account:impl","account:impl","features",0,14],[":features:address-book:api","address-book:api","features",2,1],[":features:address-book:impl","address-book:impl","features",0,4],[":features:approval:api","approval:api","features",3,2],[":features:approval:impl","approval:impl","features",0,7],[":features:biometry:api","biometry:api","features",3,0],[":features:biometry:impl","biometry:impl","features",0,6],[":features:common-features:api","common-features:api","features",11,3],[":features:common-features:impl","common-features:impl","features",0,19],[":features:create-wallet-selection:api","create-wallet-selection:api","features",2,1],[":features:create-wallet-selection:impl","create-wallet-selection:impl","features",0,7],[":features:create-wallet-start:api","create-wallet-start:api","features",1,1],[":features:create-wallet-start:impl","create-wallet-start:impl","features",0,9],[":features:details:api","details:api","features",2,1],[":features:details:impl","details:impl","features",0,23],[":features:disclaimer:api","disclaimer:api","features",2,0],[":features:disclaimer:impl","disclaimer:impl","features",0,6],[":features:feed:api","feed:api","features",4,6],[":features:feed:impl","feed:impl","features",0,36],[":features:home:api","home:api","features",1,0],[":features:home:impl","home:impl","features",0,15],[":features:hot-wallet:api","hot-wallet:api","features",10,3],[":features:hot-wallet:impl","hot-wallet:impl","features",0,12],[":features:kyc:api","kyc:api","features",4,1],[":features:kyc:impl","kyc:impl","features",0,3],[":features:kyc:mock","kyc:mock","features",0,1],[":features:manage-tokens:api","manage-tokens:api","features",6,3],[":features:manage-tokens:impl","manage-tokens:impl","features",0,16],[":features:markets:api","markets:api","features",4,4],[":features:markets:impl","markets:impl","features",0,32],[":features:nft:api","nft:api","features",5,4],[":features:nft:impl","nft:impl","features",0,14],[":features:onboarding-v2:api","onboarding-v2:api","features",7,1],[":features:onboarding-v2:impl","onboarding-v2:impl","features",0,23],[":features:onramp:api","onramp:api","features",5,3],[":features:onramp:impl","onramp:impl","features",0,27],[":features:promo-banners:api","promo-banners:api","features",3,0],[":features:promo-banners:impl","promo-banners:impl","features",0,3],[":features:push-notification-settings:api","push-notification-settings:api","features",4,1],[":features:push-notification-settings:impl","push-notification-settings:impl","features",0,6],[":features:push-notifications:api","push-notifications:api","features",9,0],[":features:push-notifications:impl","push-notifications:impl","features",0,8],[":features:qr-scanning:api","qr-scanning:api","features",1,1],[":features:qr-scanning:impl","qr-scanning:impl","features",0,4],[":features:rating:api","rating:api","features",2,0],[":features:rating:impl","rating:impl","features",0,1],[":features:referral:api","referral:api","features",1,1],[":features:referral:data","referral:data","features",0,8],[":features:referral:domain","referral:domain","features",4,10],[":features:referral:impl","referral:impl","features",0,15],[":features:send:api","send:api","features",14,8],[":features:send:impl","send:impl","features",1,32],[":features:staking:api","staking:api","features",4,4],[":features:staking:impl","staking:impl","features",0,24],[":features:stories:api","stories:api","features",1,0],[":features:stories:impl","stories:impl","features",0,3],[":features:survey:api","survey:api","features",2,0],[":features:survey:impl","survey:impl","features",0,5],[":features:swap-v2:api","swap-v2:api","features",3,8],[":features:swap-v2:impl","swap-v2:impl","features",0,30],[":features:swap:api","swap:api","features",6,3],[":features:swap:data","swap:data","features",0,14],[":features:swap:domain","swap:domain","features",5,29],[":features:swap:domain:api","swap:domain:api","features",6,4],[":features:swap:domain:models","swap:domain:models","features",7,3],[":features:swap:impl","swap:impl","features",0,39],[":features:tangempay:details:api","tangempay:details:api","features",3,2],[":features:tangempay:details:impl","tangempay:details:impl","features",0,13],[":features:tangempay:main:api","tangempay:main:api","features",2,0],[":features:tangempay:main:impl","tangempay:main:impl","features",0,1],[":features:tangempay:onboarding:api","tangempay:onboarding:api","features",1,1],[":features:tangempay:onboarding:impl","tangempay:onboarding:impl","features",0,11],[":features:tester:api","tester:api","features",4,0],[":features:tester:impl","tester:impl","features",0,15],[":features:token-recieve:api","token-recieve:api","features",9,1],[":features:token-recieve:impl","token-recieve:impl","features",0,6],[":features:tokendetails:api","tokendetails:api","features",4,3],[":features:tokendetails:impl","tokendetails:impl","features",0,48],[":features:txhistory:api","txhistory:api","features",5,3],[":features:txhistory:impl","txhistory:impl","features",0,13],[":features:usedesk:api","usedesk:api","features",1,0],[":features:usedesk:impl","usedesk:impl","features",0,1],[":features:virtual-accounts:details:api","virtual-accounts:details:api","features",3,0],[":features:virtual-accounts:details:impl","virtual-accounts:details:impl","features",0,1],[":features:virtual-accounts:main:api","virtual-accounts:main:api","features",2,0],[":features:virtual-accounts:main:impl","virtual-accounts:main:impl","features",0,1],[":features:virtual-accounts:onboarding:api","virtual-accounts:onboarding:api","features",1,0],[":features:virtual-accounts:onboarding:impl","virtual-accounts:onboarding:impl","features",0,1],[":features:wallet-settings:api","wallet-settings:api","features",3,1],[":features:wallet-settings:impl","wallet-settings:impl","features",0,24],[":features:wallet:api","wallet:api","features",14,2],[":features:wallet:impl","wallet:impl","features",0,73],[":features:walletconnect:api","walletconnect:api","features",1,1],[":features:walletconnect:impl","walletconnect:impl","features",0,24],[":features:welcome:api","welcome:api","features",1,1],[":features:welcome:impl","welcome:impl","features",0,11],[":features:yield-supply:api","yield-supply:api","features",3,4],[":features:yield-supply:impl","yield-supply:impl","features",0,19]],"e":[[":features:usedesk:impl",":features:usedesk:api",1,0],[":features:home:impl",":features:home:api",1,0],[":features:home:impl",":features:hot-wallet:api",1,0],[":features:home:impl",":domain:common",1,0],[":features:home:impl",":domain:models",1,0],[":features:home:impl",":domain:core",1,0],[":features:home:impl",":domain:card",1,0],[":features:home:impl",":domain:settings",1,0],[":features:home:impl",":domain:tokens",1,0],[":features:home:impl",":domain:wallets",1,0],[":features:home:impl",":domain:wallets:models",1,0],[":features:home:impl",":domain:legacy",1,0],[":features:home:impl",":domain:feedback",1,0],[":features:home:impl",":domain:feedback:models",1,0],[":features:home:impl",":domain:referral",1,0],[":features:home:impl",":features:referral:domain",1,0],[":features:create-wallet-start:impl",":features:create-wallet-start:api",1,0],[":features:create-wallet-start:impl",":features:hot-wallet:api",1,0],[":features:create-wallet-start:impl",":features:onboarding-v2:api",1,0],[":features:create-wallet-start:impl",":domain:card",1,0],[":features:create-wallet-start:impl",":domain:settings",1,0],[":features:create-wallet-start:impl",":domain:wallets",1,0],[":features:create-wallet-start:impl",":domain:models",1,0],[":features:create-wallet-start:impl",":domain:hot-wallet",1,0],[":features:create-wallet-start:impl",":domain:wallets:models",1,0],[":features:create-wallet-start:api",":domain:models",1,0],[":features:yield-supply:impl",":features:yield-supply:api",1,0],[":features:yield-supply:impl",":domain:models",1,0],[":features:yield-supply:impl",":domain:app-currency:models",1,0],[":features:yield-supply:impl",":domain:app-currency",1,0],[":features:yield-supply:impl",":domain:account:status",1,0],[":features:yield-supply:impl",":domain:wallets:models",1,0],[":features:yield-supply:impl",":domain:wallets",1,0],[":features:yield-supply:impl",":domain:tokens:models",1,0],[":features:yield-supply:impl",":domain:tokens",1,0],[":features:yield-supply:impl",":domain:transaction:models",1,0],[":features:yield-supply:impl",":domain:transaction",1,0],[":features:yield-supply:impl",":domain:yield-supply:models",1,0],[":features:yield-supply:impl",":domain:yield-supply",1,0],[":features:yield-supply:impl",":domain:stories:models",1,0],[":features:yield-supply:impl",":domain:stories",1,0],[":features:yield-supply:impl",":domain:feedback:models",1,0],[":features:yield-supply:impl",":domain:feedback",1,0],[":features:yield-supply:impl",":domain:balance-hiding:models",1,0],[":features:yield-supply:impl",":domain:balance-hiding",1,0],[":features:yield-supply:api",":domain:models",1,0],[":features:yield-supply:api",":domain:wallets:models",1,0],[":features:yield-supply:api",":domain:tokens:models",1,0],[":features:yield-supply:api",":domain:app-currency:models",1,0],[":features:txhistory:impl",":features:txhistory:api",1,0],[":features:txhistory:impl",":domain:models",1,0],[":features:txhistory:impl",":domain:legacy",1,0],[":features:txhistory:impl",":domain:card",1,0],[":features:txhistory:impl",":domain:txhistory",1,0],[":features:txhistory:impl",":domain:txhistory:models",1,0],[":features:txhistory:impl",":domain:wallets",1,0],[":features:txhistory:impl",":domain:wallets:models",1,0],[":features:txhistory:impl",":domain:tokens",1,0],[":features:txhistory:impl",":domain:tokens:models",1,0],[":features:txhistory:impl",":domain:balance-hiding",1,0],[":features:txhistory:impl",":domain:balance-hiding:models",1,0],[":features:txhistory:impl",":domain:account:status",1,0],[":features:txhistory:api",":domain:models",1,1],[":features:txhistory:api",":domain:tokens:models",1,0],[":features:txhistory:api",":domain:wallets:models",1,0],[":features:referral:impl",":features:referral:api",1,1],[":features:referral:impl",":features:common-features:api",1,1],[":features:referral:impl",":domain:demo",1,0],[":features:referral:impl",":domain:wallets",1,0],[":features:referral:impl",":domain:legacy",1,0],[":features:referral:impl",":domain:card",1,0],[":features:referral:impl",":domain:wallets:models",1,0],[":features:referral:impl",":domain:notifications:models",1,0],[":features:referral:impl",":domain:account:status",1,0],[":features:referral:impl",":domain:account",1,0],[":features:referral:impl",":domain:balance-hiding",1,0],[":features:referral:impl",":domain:balance-hiding:models",1,0],[":features:referral:impl",":domain:app-currency",1,0],[":features:referral:impl",":domain:app-currency:models",1,0],[":features:referral:impl",":features:referral:domain",1,0],[":features:referral:api",":domain:models",1,1],[":features:referral:data",":data:common",1,0],[":features:referral:data",":domain:common",1,0],[":features:referral:data",":domain:legacy",1,0],[":features:referral:data",":domain:models",1,0],[":features:referral:data",":domain:tokens:models",1,0],[":features:referral:data",":domain:wallets:models",1,0],[":features:referral:data",":domain:referral",1,0],[":features:referral:data",":features:referral:domain",1,0],[":features:referral:domain",":domain:account:status",1,0],[":features:referral:domain",":domain:card",1,0],[":features:referral:domain",":domain:common",1,0],[":features:referral:domain",":domain:models",1,0],[":features:referral:domain",":domain:tokens",1,0],[":features:referral:domain",":domain:tokens:models",1,0],[":features:referral:domain",":domain:wallets",1,0],[":features:referral:domain",":domain:wallets:models",1,0],[":features:referral:domain",":features:tester:api",1,0],[":features:referral:domain",":features:wallet:api",1,0],[":features:wallet-settings:impl",":features:wallet-settings:api",1,0],[":features:wallet-settings:impl",":features:manage-tokens:api",1,0],[":features:wallet-settings:impl",":features:nft:api",1,0],[":features:wallet-settings:impl",":features:onboarding-v2:api",1,0],[":features:wallet-settings:impl",":features:push-notifications:api",1,0],[":features:wallet-settings:impl",":features:push-notification-settings:api",1,0],[":features:wallet-settings:impl",":features:hot-wallet:api",1,0],[":features:wallet-settings:impl",":features:wallet:api",1,0],[":features:wallet-settings:impl",":domain:account:status",1,0],[":features:wallet-settings:impl",":domain:app-currency",1,0],[":features:wallet-settings:impl",":domain:app-currency:models",1,0],[":features:wallet-settings:impl",":domain:balance-hiding",1,0],[":features:wallet-settings:impl",":domain:balance-hiding:models",1,0],[":features:wallet-settings:impl",":domain:legacy",1,0],[":features:wallet-settings:impl",":domain:card",1,0],[":features:wallet-settings:impl",":domain:models",1,0],[":features:wallet-settings:impl",":domain:wallets",1,0],[":features:wallet-settings:impl",":domain:wallets:models",1,0],[":features:wallet-settings:impl",":domain:demo",1,0],[":features:wallet-settings:impl",":domain:nft",1,0],[":features:wallet-settings:impl",":domain:settings",1,0],[":features:wallet-settings:impl",":domain:notifications:models",1,0],[":features:wallet-settings:impl",":domain:notifications",1,0],[":features:wallet-settings:impl",":domain:assetsdiscovery",1,0],[":features:wallet-settings:api",":domain:models",1,0],[":features:token-recieve:impl",":domain:models",1,0],[":features:token-recieve:impl",":domain:transaction",1,0],[":features:token-recieve:impl",":domain:transaction:models",1,0],[":features:token-recieve:impl",":domain:tokens",1,0],[":features:token-recieve:impl",":domain:tokens:models",1,0],[":features:token-recieve:impl",":features:token-recieve:api",1,0],[":features:token-recieve:api",":domain:models",1,0],[":features:rating:impl",":features:rating:api",1,0],[":features:kyc:impl",":features:kyc:api",1,0],[":features:kyc:impl",":domain:visa",1,0],[":features:kyc:impl",":domain:wallets:models",1,0],[":features:kyc:mock",":features:kyc:api",1,0],[":features:kyc:api",":domain:models",1,0],[":features:disclaimer:impl",":domain:models",1,0],[":features:disclaimer:impl",":domain:card",1,0],[":features:disclaimer:impl",":domain:settings",1,0],[":features:disclaimer:impl",":domain:notifications",1,0],[":features:disclaimer:impl",":features:disclaimer:api",1,0],[":features:disclaimer:impl",":features:push-notifications:api",1,0],[":features:nft:impl",":features:common-features:api",1,0],[":features:nft:impl",":features:nft:api",1,0],[":features:nft:impl",":features:token-recieve:api",1,0],[":features:nft:impl",":domain:account:status",1,0],[":features:nft:impl",":domain:wallets",1,0],[":features:nft:impl",":domain:app-currency:models",1,0],[":features:nft:impl",":domain:app-currency",1,0],[":features:nft:impl",":domain:models",1,0],[":features:nft:impl",":domain:nft",1,0],[":features:nft:impl",":domain:nft:models",1,0],[":features:nft:impl",":domain:tokens:models",1,0],[":features:nft:impl",":domain:wallets:models",1,0],[":features:nft:impl",":domain:transaction",1,0],[":features:nft:impl",":domain:tokens",1,0],[":features:nft:api",":domain:models",1,0],[":features:nft:api",":domain:nft:models",1,0],[":features:nft:api",":domain:wallets:models",1,0],[":features:nft:api",":domain:account",1,0],[":features:tokendetails:impl",":features:rating:api",1,0],[":features:tokendetails:impl",":domain:account:status",1,0],[":features:tokendetails:impl",":domain:app-currency",1,0],[":features:tokendetails:impl",":domain:app-currency:models",1,0],[":features:tokendetails:impl",":domain:balance-hiding",1,0],[":features:tokendetails:impl",":domain:balance-hiding:models",1,0],[":features:tokendetails:impl",":domain:card",1,0],[":features:tokendetails:impl",":domain:demo",1,0],[":features:tokendetails:impl",":domain:dynamic-addresses",1,0],[":features:tokendetails:impl",":domain:dynamic-addresses:models",1,0],[":features:tokendetails:impl",":domain:feedback",1,0],[":features:tokendetails:impl",":domain:feedback:models",1,0],[":features:tokendetails:impl",":domain:markets:models",1,0],[":features:tokendetails:impl",":domain:models",1,0],[":features:tokendetails:impl",":domain:notifications:models",1,0],[":features:tokendetails:impl",":domain:offramp",1,0],[":features:tokendetails:impl",":domain:onramp",1,0],[":features:tokendetails:impl",":domain:onramp:models",1,0],[":features:tokendetails:impl",":domain:stories",1,0],[":features:tokendetails:impl",":domain:stories:models",1,0],[":features:tokendetails:impl",":domain:quotes",1,0],[":features:tokendetails:impl",":domain:settings",1,0],[":features:tokendetails:impl",":domain:staking",1,0],[":features:tokendetails:impl",":domain:tokens",1,0],[":features:tokendetails:impl",":domain:tokens:models",1,0],[":features:tokendetails:impl",":domain:transaction",1,0],[":features:tokendetails:impl",":domain:transaction:models",1,0],[":features:tokendetails:impl",":domain:txhistory",1,0],[":features:tokendetails:impl",":domain:txhistory:models",1,0],[":features:tokendetails:impl",":domain:wallets",1,0],[":features:tokendetails:impl",":domain:wallets:models",1,0],[":features:tokendetails:impl",":domain:yield-supply",1,0],[":features:tokendetails:impl",":domain:yield-supply:models",1,0],[":features:tokendetails:impl",":features:swap:domain",1,0],[":features:tokendetails:impl",":features:swap:domain:api",1,0],[":features:tokendetails:impl",":features:swap:domain:models",1,0],[":features:tokendetails:impl",":features:tokendetails:api",1,0],[":features:tokendetails:impl",":features:wallet:api",1,0],[":features:tokendetails:impl",":features:staking:api",1,0],[":features:tokendetails:impl",":features:markets:api",1,0],[":features:tokendetails:impl",":features:onramp:api",1,0],[":features:tokendetails:impl",":features:push-notifications:api",1,0],[":features:tokendetails:impl",":features:swap:api",1,0],[":features:tokendetails:impl",":features:txhistory:api",1,0],[":features:tokendetails:impl",":features:send:api",1,0],[":features:tokendetails:impl",":features:token-recieve:api",1,0],[":features:tokendetails:impl",":features:yield-supply:api",1,0],[":features:tokendetails:impl",":features:common-features:api",1,0],[":features:tokendetails:api",":domain:models",1,1],[":features:tokendetails:api",":domain:tokens:models",1,0],[":features:tokendetails:api",":domain:wallets:models",1,0],[":features:qr-scanning:impl",":features:qr-scanning:api",1,0],[":features:qr-scanning:impl",":domain:qr-scanning",1,0],[":features:qr-scanning:impl",":domain:qr-scanning:models",1,0],[":features:qr-scanning:impl",":data:card",1,0],[":features:qr-scanning:api",":domain:qr-scanning:models",1,0],[":features:swap:impl",":features:common-features:api",1,0],[":features:swap:impl",":data:common",1,0],[":features:swap:impl",":domain:models",1,0],[":features:swap:impl",":domain:account",2,0],[":features:swap:impl",":domain:app-currency",1,0],[":features:swap:impl",":domain:app-currency:models",1,0],[":features:swap:impl",":domain:balance-hiding",1,0],[":features:swap:impl",":domain:balance-hiding:models",1,0],[":features:swap:impl",":domain:tokens",1,0],[":features:swap:impl",":domain:tokens:models",1,0],[":features:swap:impl",":domain:transaction",1,0],[":features:swap:impl",":domain:transaction:models",1,0],[":features:swap:impl",":domain:wallets",1,0],[":features:swap:impl",":domain:wallets:models",1,0],[":features:swap:impl",":domain:settings",1,0],[":features:swap:impl",":domain:staking",1,0],[":features:swap:impl",":domain:feedback",1,0],[":features:swap:impl",":domain:feedback:models",1,0],[":features:swap:impl",":domain:stories",1,0],[":features:swap:impl",":domain:stories:models",1,0],[":features:swap:impl",":domain:txhistory",1,0],[":features:swap:impl",":domain:txhistory:models",1,0],[":features:swap:impl",":domain:express:models",1,0],[":features:swap:impl",":domain:account:status",1,0],[":features:swap:impl",":domain:card",1,0],[":features:swap:impl",":domain:visa",1,0],[":features:swap:impl",":domain:markets",1,0],[":features:swap:impl",":domain:swap",1,0],[":features:swap:impl",":domain:swap:models",1,0],[":features:swap:impl",":features:swap:domain",1,0],[":features:swap:impl",":features:swap:domain:api",1,0],[":features:swap:impl",":features:swap:domain:models",1,0],[":features:swap:impl",":features:wallet:api",1,0],[":features:swap:impl",":features:swap:api",2,0],[":features:swap:impl",":features:send:api",1,0],[":features:swap:impl",":features:send:impl",1,0],[":features:swap:impl",":features:feed:api",1,0],[":features:swap:impl",":features:tokendetails:api",1,0],[":features:swap:impl",":features:approval:api",1,0],[":features:swap:api",":domain:models",1,1],[":features:swap:api",":domain:tokens:models",1,0],[":features:swap:api",":domain:wallets:models",1,0],[":features:swap:data",":features:swap:domain",1,0],[":features:swap:data",":features:swap:domain:models",1,0],[":features:swap:data",":features:swap:domain:api",1,0],[":features:swap:data",":domain:tokens:models",1,0],[":features:swap:data",":domain:legacy",1,0],[":features:swap:data",":domain:wallet-manager",1,0],[":features:swap:data",":domain:models",1,0],[":features:swap:data",":domain:wallets",1,0],[":features:swap:data",":domain:wallets:models",1,0],[":features:swap:data",":domain:transaction:models",1,0],[":features:swap:data",":domain:express:models",1,0],[":features:swap:data",":domain:account:status",1,0],[":features:swap:data",":domain:txhistory",1,0],[":features:swap:data",":data:common",1,0],[":features:swap:domain",":domain:swap:models",1,0],[":features:swap:domain",":domain:swap",1,0],[":features:swap:domain",":domain:app-currency",1,0],[":features:swap:domain",":domain:app-currency:models",1,0],[":features:swap:domain",":domain:card",1,0],[":features:swap:domain",":domain:demo",1,0],[":features:swap:domain",":domain:legacy",1,0],[":features:swap:domain",":domain:models",1,0],[":features:swap:domain",":domain:quotes",1,0],[":features:swap:domain",":domain:staking",1,0],[":features:swap:domain",":domain:tokens",1,0],[":features:swap:domain",":domain:tokens:models",1,0],[":features:swap:domain",":domain:transaction",1,0],[":features:swap:domain",":domain:transaction:models",1,0],[":features:swap:domain",":domain:txhistory:models",1,0],[":features:swap:domain",":domain:wallets",1,0],[":features:swap:domain",":domain:wallets:models",1,0],[":features:swap:domain",":domain:express:models",1,0],[":features:swap:domain",":domain:account",1,0],[":features:swap:domain",":domain:account:status",1,0],[":features:swap:domain",":domain:visa",1,0],[":features:swap:domain",":domain:visa:models",1,0],[":features:swap:domain",":domain:balance-hiding",1,0],[":features:swap:domain",":domain:yield-supply",1,0],[":features:swap:domain",":features:wallet:api",1,0],[":features:swap:domain",":features:swap:api",1,0],[":features:swap:domain",":features:swap:domain:api",1,0],[":features:swap:domain",":features:swap:domain:models",1,0],[":features:swap:domain",":features:send:api",1,0],[":features:swap:domain:models",":domain:models",1,1],[":features:swap:domain:models",":domain:tokens:models",1,0],[":features:swap:domain:models",":domain:transaction:models",1,0],[":features:swap:domain:api",":features:swap:domain:models",1,0],[":features:swap:domain:api",":domain:tokens:models",1,0],[":features:swap:domain:api",":domain:wallets:models",1,0],[":features:swap:domain:api",":domain:express:models",1,0],[":features:details:impl",":features:details:api",1,0],[":features:details:impl",":features:wallet:api",1,0],[":features:details:impl",":features:disclaimer:api",1,0],[":features:details:impl",":features:tester:api",1,0],[":features:details:impl",":features:create-wallet-selection:api",1,0],[":features:details:impl",":features:onboarding-v2:api",1,0],[":features:details:impl",":features:address-book:api",1,0],[":features:details:impl",":domain:models",1,0],[":features:details:impl",":domain:feedback",1,0],[":features:details:impl",":domain:feedback:models",1,0],[":features:details:impl",":domain:wallets",1,0],[":features:details:impl",":domain:wallets:models",1,0],[":features:details:impl",":domain:card",1,0],[":features:details:impl",":domain:tokens",1,0],[":features:details:impl",":domain:tokens:models",1,0],[":features:details:impl",":domain:app-currency",1,0],[":features:details:impl",":domain:app-currency:models",1,0],[":features:details:impl",":domain:wallet-connect",1,0],[":features:details:impl",":domain:balance-hiding",1,0],[":features:details:impl",":domain:balance-hiding:models",1,0],[":features:details:impl",":domain:legacy",1,0],[":features:details:impl",":domain:settings",1,0],[":features:details:impl",":domain:visa",1,0],[":features:details:api",":domain:models",1,0],[":features:create-wallet-selection:impl",":features:create-wallet-selection:api",1,0],[":features:create-wallet-selection:impl",":features:hot-wallet:api",1,0],[":features:create-wallet-selection:impl",":domain:card",1,0],[":features:create-wallet-selection:impl",":domain:settings",1,0],[":features:create-wallet-selection:impl",":domain:wallets",1,0],[":features:create-wallet-selection:impl",":domain:models",1,0],[":features:create-wallet-selection:impl",":domain:hot-wallet",1,0],[":features:create-wallet-selection:api",":domain:models",1,0],[":features:welcome:impl",":features:welcome:api",1,0],[":features:welcome:impl",":features:wallet:api",1,0],[":features:welcome:impl",":features:onboarding-v2:api",1,0],[":features:welcome:impl",":domain:app-currency:models",1,0],[":features:welcome:impl",":domain:models",1,0],[":features:welcome:impl",":domain:tokens:models",1,0],[":features:welcome:impl",":domain:wallets:models",1,0],[":features:welcome:impl",":domain:app-currency",1,0],[":features:welcome:impl",":domain:wallets",1,0],[":features:welcome:impl",":domain:card",1,0],[":features:welcome:impl",":domain:settings",1,0],[":features:welcome:api",":domain:wallets:models",1,0],[":features:common-features:impl",":features:common-features:api",1,0],[":features:common-features:impl",":features:wallet:api",1,0],[":features:common-features:impl",":features:token-recieve:api",1,0],[":features:common-features:impl",":domain:models",1,0],[":features:common-features:impl",":domain:account",1,0],[":features:common-features:impl",":domain:account:status",1,0],[":features:common-features:impl",":domain:core",1,0],[":features:common-features:impl",":domain:app-currency",1,0],[":features:common-features:impl",":domain:app-currency:models",1,0],[":features:common-features:impl",":domain:markets",1,0],[":features:common-features:impl",":domain:transaction",1,0],[":features:common-features:impl",":domain:tokens",1,0],[":features:common-features:impl",":domain:tokens:models",1,0],[":features:common-features:impl",":domain:manage-tokens",1,0],[":features:common-features:impl",":domain:manage-tokens:models",1,0],[":features:common-features:impl",":domain:balance-hiding",1,0],[":features:common-features:impl",":domain:balance-hiding:models",1,0],[":features:common-features:impl",":domain:wallets",1,0],[":features:common-features:impl",":domain:wallets:models",1,0],[":features:common-features:api",":domain:models",1,0],[":features:common-features:api",":domain:markets",1,0],[":features:common-features:api",":domain:account",1,0],[":features:onramp:impl",":features:common-features:api",1,0],[":features:onramp:impl",":features:onramp:api",1,0],[":features:onramp:impl",":features:swap:api",1,0],[":features:onramp:impl",":features:swap:domain",1,0],[":features:onramp:impl",":features:swap:domain:api",1,0],[":features:onramp:impl",":features:swap:domain:models",1,0],[":features:onramp:impl",":features:feed:api",1,0],[":features:onramp:impl",":domain:app-currency",1,0],[":features:onramp:impl",":domain:app-currency:models",1,0],[":features:onramp:impl",":domain:balance-hiding",1,0],[":features:onramp:impl",":domain:balance-hiding:models",1,0],[":features:onramp:impl",":domain:card",1,0],[":features:onramp:impl",":domain:demo",1,0],[":features:onramp:impl",":domain:models",1,0],[":features:onramp:impl",":domain:offramp",1,0],[":features:onramp:impl",":domain:onramp",1,0],[":features:onramp:impl",":domain:tokens",1,0],[":features:onramp:impl",":domain:tokens:models",1,0],[":features:onramp:impl",":domain:wallets",1,0],[":features:onramp:impl",":domain:wallets:models",1,0],[":features:onramp:impl",":domain:settings",1,0],[":features:onramp:impl",":domain:transaction:models",1,0],[":features:onramp:impl",":domain:account:status",1,0],[":features:onramp:impl",":domain:app-theme",1,0],[":features:onramp:impl",":domain:app-theme:models",1,0],[":features:onramp:impl",":data:common",1,0],[":features:onramp:impl",":domain:markets",1,0],[":features:onramp:api",":domain:onramp:models",1,0],[":features:onramp:api",":domain:tokens:models",1,0],[":features:onramp:api",":domain:wallets:models",1,0],[":features:walletconnect:impl",":features:common-features:api",1,0],[":features:walletconnect:impl",":features:wallet:api",1,0],[":features:walletconnect:impl",":features:walletconnect:api",1,0],[":features:walletconnect:impl",":features:send:api",1,0],[":features:walletconnect:impl",":domain:account",1,0],[":features:walletconnect:impl",":domain:account:status",1,0],[":features:walletconnect:impl",":domain:app-currency:models",1,0],[":features:walletconnect:impl",":domain:balance-hiding:models",1,0],[":features:walletconnect:impl",":domain:blockaid:models",1,0],[":features:walletconnect:impl",":domain:models",1,0],[":features:walletconnect:impl",":domain:qr-scanning:models",1,0],[":features:walletconnect:impl",":domain:tokens:models",1,0],[":features:walletconnect:impl",":domain:transaction:models",1,0],[":features:walletconnect:impl",":domain:wallets:models",1,0],[":features:walletconnect:impl",":domain:wallet-connect",1,0],[":features:walletconnect:impl",":domain:wallet-connect:models",1,0],[":features:walletconnect:impl",":domain:app-currency",1,0],[":features:walletconnect:impl",":domain:balance-hiding",1,0],[":features:walletconnect:impl",":domain:legacy",1,0],[":features:walletconnect:impl",":domain:qr-scanning",1,0],[":features:walletconnect:impl",":domain:tokens",1,0],[":features:walletconnect:impl",":domain:transaction",1,0],[":features:walletconnect:impl",":domain:wallets",1,0],[":features:walletconnect:impl",":data:card",1,0],[":features:walletconnect:api",":domain:models",1,0],[":features:stories:impl",":features:stories:api",1,0],[":features:stories:impl",":domain:stories",1,0],[":features:stories:impl",":domain:stories:models",1,0],[":features:onboarding-v2:impl",":features:onboarding-v2:api",1,0],[":features:onboarding-v2:impl",":features:manage-tokens:api",1,0],[":features:onboarding-v2:impl",":features:biometry:api",1,0],[":features:onboarding-v2:impl",":features:push-notifications:api",1,0],[":features:onboarding-v2:impl",":features:hot-wallet:api",1,0],[":features:onboarding-v2:impl",":features:token-recieve:api",1,0],[":features:onboarding-v2:impl",":domain:account",1,0],[":features:onboarding-v2:impl",":domain:models",1,0],[":features:onboarding-v2:impl",":domain:feedback",1,0],[":features:onboarding-v2:impl",":domain:feedback:models",1,0],[":features:onboarding-v2:impl",":domain:core",1,0],[":features:onboarding-v2:impl",":domain:card",1,0],[":features:onboarding-v2:impl",":domain:wallets",1,0],[":features:onboarding-v2:impl",":domain:wallets:models",1,0],[":features:onboarding-v2:impl",":domain:legacy",1,0],[":features:onboarding-v2:impl",":domain:settings",1,0],[":features:onboarding-v2:impl",":domain:onboarding",1,0],[":features:onboarding-v2:impl",":domain:visa",1,0],[":features:onboarding-v2:impl",":domain:tokens",1,0],[":features:onboarding-v2:impl",":domain:tokens:models",1,0],[":features:onboarding-v2:impl",":domain:onramp",1,0],[":features:onboarding-v2:impl",":domain:transaction",1,0],[":features:onboarding-v2:impl",":domain:staking",1,0],[":features:onboarding-v2:api",":domain:models",1,0],[":features:promo-banners:impl",":features:promo-banners:api",1,0],[":features:promo-banners:impl",":domain:common",1,0],[":features:promo-banners:impl",":domain:models",1,0],[":features:push-notifications:impl",":domain:settings",1,0],[":features:push-notifications:impl",":domain:notifications",1,0],[":features:push-notifications:impl",":domain:push-notification-preferences",1,0],[":features:push-notifications:impl",":domain:common",1,0],[":features:push-notifications:impl",":domain:account",1,0],[":features:push-notifications:impl",":domain:models",1,0],[":features:push-notifications:impl",":features:push-notifications:api",1,0],[":features:push-notifications:impl",":features:push-notification-settings:api",1,0],[":features:swap-v2:impl",":features:swap-v2:api",1,0],[":features:swap-v2:impl",":features:manage-tokens:api",1,0],[":features:swap-v2:impl",":features:send:api",1,0],[":features:swap-v2:impl",":features:common-features:api",1,0],[":features:swap-v2:impl",":domain:models",1,0],[":features:swap-v2:impl",":domain:wallets:models",1,0],[":features:swap-v2:impl",":domain:wallets",1,0],[":features:swap-v2:impl",":domain:tokens:models",1,0],[":features:swap-v2:impl",":domain:tokens",1,0],[":features:swap-v2:impl",":domain:card",1,0],[":features:swap-v2:impl",":domain:app-currency:models",1,0],[":features:swap-v2:impl",":domain:app-currency",1,0],[":features:swap-v2:impl",":domain:express:models",1,0],[":features:swap-v2:impl",":domain:swap:models",1,0],[":features:swap-v2:impl",":domain:swap",1,0],[":features:swap-v2:impl",":domain:manage-tokens:models",1,0],[":features:swap-v2:impl",":domain:manage-tokens",1,0],[":features:swap-v2:impl",":domain:transaction:models",1,0],[":features:swap-v2:impl",":domain:transaction",1,0],[":features:swap-v2:impl",":domain:legacy",1,0],[":features:swap-v2:impl",":domain:balance-hiding:models",1,0],[":features:swap-v2:impl",":domain:balance-hiding",1,0],[":features:swap-v2:impl",":domain:settings",1,0],[":features:swap-v2:impl",":domain:txhistory:models",1,0],[":features:swap-v2:impl",":domain:txhistory",1,0],[":features:swap-v2:impl",":domain:notifications",1,0],[":features:swap-v2:impl",":domain:feedback:models",1,0],[":features:swap-v2:impl",":domain:feedback",1,0],[":features:swap-v2:impl",":domain:account",1,0],[":features:swap-v2:impl",":domain:account:status",1,0],[":features:swap-v2:api",":features:send:api",1,1],[":features:swap-v2:api",":domain:wallets:models",1,0],[":features:swap-v2:api",":domain:express:models",1,0],[":features:swap-v2:api",":domain:swap:models",1,0],[":features:swap-v2:api",":domain:manage-tokens:models",1,0],[":features:swap-v2:api",":domain:models",1,0],[":features:swap-v2:api",":domain:tokens:models",1,0],[":features:swap-v2:api",":domain:app-currency:models",1,0],[":features:manage-tokens:impl",":features:manage-tokens:api",1,0],[":features:manage-tokens:impl",":features:swap-v2:api",1,0],[":features:manage-tokens:impl",":features:common-features:api",1,0],[":features:manage-tokens:impl",":domain:account:status",1,0],[":features:manage-tokens:impl",":domain:account",1,0],[":features:manage-tokens:impl",":domain:card",1,0],[":features:manage-tokens:impl",":domain:legacy",1,0],[":features:manage-tokens:impl",":domain:manage-tokens",1,0],[":features:manage-tokens:impl",":domain:tokens",1,0],[":features:manage-tokens:impl",":domain:tokens:models",1,0],[":features:manage-tokens:impl",":domain:wallets",1,0],[":features:manage-tokens:impl",":domain:wallets:models",1,0],[":features:manage-tokens:impl",":domain:swap:models",1,0],[":features:manage-tokens:impl",":domain:markets:models",1,0],[":features:manage-tokens:impl",":domain:notifications",1,0],[":features:manage-tokens:impl",":domain:dynamic-addresses",1,0],[":features:manage-tokens:api",":domain:models",1,0],[":features:manage-tokens:api",":domain:wallets:models",1,0],[":features:manage-tokens:api",":domain:manage-tokens:models",1,0],[":features:markets:impl",":features:markets:api",1,1],[":features:markets:impl",":features:onramp:api",1,1],[":features:markets:impl",":features:send:api",1,1],[":features:markets:impl",":features:token-recieve:api",1,1],[":features:markets:impl",":features:wallet:api",1,1],[":features:markets:impl",":features:account:api",1,1],[":features:markets:impl",":data:common",1,0],[":features:markets:impl",":domain:account",1,0],[":features:markets:impl",":domain:account:status",1,0],[":features:markets:impl",":domain:app-currency",1,0],[":features:markets:impl",":domain:app-currency:models",1,0],[":features:markets:impl",":domain:balance-hiding",1,0],[":features:markets:impl",":domain:balance-hiding:models",1,0],[":features:markets:impl",":domain:card",1,0],[":features:markets:impl",":domain:demo",1,0],[":features:markets:impl",":domain:feedback",1,0],[":features:markets:impl",":domain:feedback:models",1,0],[":features:markets:impl",":domain:manage-tokens",1,0],[":features:markets:impl",":domain:markets",1,0],[":features:markets:impl",":domain:offramp",1,0],[":features:markets:impl",":domain:onramp:models",1,0],[":features:markets:impl",":domain:staking:models",1,0],[":features:markets:impl",":domain:staking",1,0],[":features:markets:impl",":domain:tokens",1,0],[":features:markets:impl",":domain:tokens:models",1,0],[":features:markets:impl",":domain:wallets",1,0],[":features:markets:impl",":domain:wallets:models",1,0],[":features:markets:impl",":domain:settings",1,0],[":features:markets:impl",":domain:notifications:models",1,0],[":features:markets:impl",":domain:transaction",1,0],[":features:markets:impl",":domain:yield-supply:models",1,0],[":features:markets:impl",":domain:yield-supply",1,0],[":features:markets:api",":domain:core",1,0],[":features:markets:api",":domain:tokens:models",1,0],[":features:markets:api",":domain:app-currency:models",1,0],[":features:markets:api",":domain:markets:models",1,0],[":features:feed:impl",":features:feed:api",1,1],[":features:feed:impl",":features:onramp:api",1,1],[":features:feed:impl",":features:send:api",1,1],[":features:feed:impl",":features:token-recieve:api",1,1],[":features:feed:impl",":features:wallet:api",1,1],[":features:feed:impl",":features:account:api",1,1],[":features:feed:impl",":features:common-features:api",1,1],[":features:feed:impl",":features:promo-banners:api",1,0],[":features:feed:impl",":data:common",1,0],[":features:feed:impl",":domain:account",1,0],[":features:feed:impl",":domain:account:status",1,0],[":features:feed:impl",":domain:app-currency",1,0],[":features:feed:impl",":domain:app-currency:models",1,0],[":features:feed:impl",":domain:balance-hiding",1,0],[":features:feed:impl",":domain:balance-hiding:models",1,0],[":features:feed:impl",":domain:card",1,0],[":features:feed:impl",":domain:demo",1,0],[":features:feed:impl",":domain:feedback",1,0],[":features:feed:impl",":domain:feedback:models",1,0],[":features:feed:impl",":domain:manage-tokens",1,0],[":features:feed:impl",":domain:markets",1,0],[":features:feed:impl",":domain:offramp",1,0],[":features:feed:impl",":domain:onramp:models",1,0],[":features:feed:impl",":domain:staking:models",1,0],[":features:feed:impl",":domain:tokens",1,0],[":features:feed:impl",":domain:tokens:models",1,0],[":features:feed:impl",":domain:wallets",1,0],[":features:feed:impl",":domain:wallets:models",1,0],[":features:feed:impl",":domain:settings",1,0],[":features:feed:impl",":domain:notifications:models",1,0],[":features:feed:impl",":domain:transaction",1,0],[":features:feed:impl",":domain:news",1,0],[":features:feed:impl",":domain:yield-supply:models",1,0],[":features:feed:impl",":domain:yield-supply",1,0],[":features:feed:impl",":domain:earn",1,0],[":features:feed:impl",":domain:search",1,0],[":features:feed:api",":features:account:api",1,1],[":features:feed:api",":domain:core",1,0],[":features:feed:api",":domain:models",1,0],[":features:feed:api",":domain:tokens:models",1,0],[":features:feed:api",":domain:app-currency:models",1,0],[":features:feed:api",":domain:markets:models",1,0],[":features:staking:impl",":domain:tokens",1,0],[":features:staking:impl",":domain:tokens:models",1,0],[":features:staking:impl",":domain:wallets",1,0],[":features:staking:impl",":domain:wallets:models",1,0],[":features:staking:impl",":domain:staking",1,0],[":features:staking:impl",":domain:balance-hiding",1,0],[":features:staking:impl",":domain:balance-hiding:models",1,0],[":features:staking:impl",":domain:app-currency",1,0],[":features:staking:impl",":domain:app-currency:models",1,0],[":features:staking:impl",":domain:legacy",1,0],[":features:staking:impl",":domain:models",1,0],[":features:staking:impl",":domain:transaction",1,0],[":features:staking:impl",":domain:transaction:models",1,0],[":features:staking:impl",":domain:txhistory",1,0],[":features:staking:impl",":domain:txhistory:models",1,0],[":features:staking:impl",":domain:feedback",1,0],[":features:staking:impl",":domain:feedback:models",1,0],[":features:staking:impl",":domain:notifications:models",1,0],[":features:staking:impl",":domain:account",1,0],[":features:staking:impl",":domain:account:status",1,0],[":features:staking:impl",":features:send:api",1,0],[":features:staking:impl",":features:staking:api",1,0],[":features:staking:impl",":features:txhistory:api",1,0],[":features:staking:impl",":features:approval:api",1,0],[":features:staking:api",":domain:models",1,1],[":features:staking:api",":domain:staking",1,0],[":features:staking:api",":domain:tokens:models",1,0],[":features:staking:api",":domain:wallets:models",1,0],[":features:address-book:impl",":features:address-book:api",1,0],[":features:address-book:impl",":domain:account",1,0],[":features:address-book:impl",":domain:address-book",1,0],[":features:address-book:impl",":domain:models",1,0],[":features:address-book:api",":domain:models",1,0],[":features:wallet:impl",":domain:account",1,0],[":features:wallet:impl",":domain:account:status",1,0],[":features:wallet:impl",":domain:analytics",1,0],[":features:wallet:impl",":domain:app-currency",1,0],[":features:wallet:impl",":domain:app-currency:models",1,0],[":features:wallet:impl",":domain:balance-hiding",1,0],[":features:wallet:impl",":domain:balance-hiding:models",1,0],[":features:wallet:impl",":domain:card",1,0],[":features:wallet:impl",":domain:wallet-manager",1,0],[":features:wallet:impl",":domain:demo",1,0],[":features:wallet:impl",":domain:feedback",1,0],[":features:wallet:impl",":domain:feedback:models",1,0],[":features:wallet:impl",":domain:legacy",1,0],[":features:wallet:impl",":domain:markets:models",1,0],[":features:wallet:impl",":domain:models",1,0],[":features:wallet:impl",":domain:networks",1,0],[":features:wallet:impl",":domain:qr-scanning",1,0],[":features:wallet:impl",":domain:qr-scanning:models",1,0],[":features:wallet:impl",":domain:wallet-connect",1,0],[":features:wallet:impl",":domain:wallet-connect:models",1,0],[":features:wallet:impl",":domain:nft",1,0],[":features:wallet:impl",":domain:nft:models",1,0],[":features:wallet:impl",":domain:hot-wallet",1,0],[":features:wallet:impl",":domain:offramp",1,0],[":features:wallet:impl",":domain:onramp",1,0],[":features:wallet:impl",":domain:onramp:models",1,0],[":features:wallet:impl",":domain:stories",1,0],[":features:wallet:impl",":domain:stories:models",1,0],[":features:wallet:impl",":domain:quotes",1,0],[":features:wallet:impl",":domain:settings",1,0],[":features:wallet:impl",":domain:staking",1,0],[":features:wallet:impl",":domain:staking:models",1,0],[":features:wallet:impl",":domain:tokens",1,0],[":features:wallet:impl",":domain:tokens:models",1,0],[":features:wallet:impl",":domain:txhistory",1,0],[":features:wallet:impl",":domain:txhistory:models",1,0],[":features:wallet:impl",":domain:visa",1,0],[":features:wallet:impl",":domain:wallets",1,0],[":features:wallet:impl",":domain:wallets:models",1,0],[":features:wallet:impl",":domain:notifications",1,0],[":features:wallet:impl",":domain:push-notification-preferences",1,0],[":features:wallet:impl",":domain:transaction",1,0],[":features:wallet:impl",":domain:yield-supply",1,0],[":features:wallet:impl",":domain:yield-supply:models",1,0],[":features:wallet:impl",":domain:app-theme",1,0],[":features:wallet:impl",":domain:app-theme:models",1,0],[":features:wallet:impl",":domain:assetsdiscovery",1,0],[":features:wallet:impl",":features:common-features:api",1,0],[":features:wallet:impl",":features:account:api",1,0],[":features:wallet:impl",":features:details:api",1,0],[":features:wallet:impl",":features:hot-wallet:api",1,0],[":features:wallet:impl",":features:manage-tokens:api",1,0],[":features:wallet:impl",":features:markets:api",1,0],[":features:wallet:impl",":features:onboarding-v2:api",1,0],[":features:wallet:impl",":features:onramp:api",1,0],[":features:wallet:impl",":features:push-notifications:api",1,0],[":features:wallet:impl",":features:push-notification-settings:api",1,0],[":features:wallet:impl",":features:swap:api",1,0],[":features:wallet:impl",":features:tester:api",1,0],[":features:wallet:impl",":features:tokendetails:api",1,0],[":features:wallet:impl",":features:wallet:api",1,0],[":features:wallet:impl",":features:wallet-settings:api",1,0],[":features:wallet:impl",":features:biometry:api",1,0],[":features:wallet:impl",":features:nft:api",1,0],[":features:wallet:impl",":features:send:api",1,0],[":features:wallet:impl",":features:kyc:api",1,0],[":features:wallet:impl",":features:token-recieve:api",1,0],[":features:wallet:impl",":features:yield-supply:api",1,0],[":features:wallet:impl",":features:feed:api",1,0],[":features:wallet:impl",":features:promo-banners:api",1,0],[":features:wallet:impl",":features:tangempay:main:api",1,0],[":features:wallet:impl",":features:tangempay:details:api",1,0],[":features:wallet:impl",":features:virtual-accounts:main:api",1,0],[":features:wallet:api",":domain:models",1,0],[":features:wallet:api",":domain:visa:models",1,0],[":features:tester:impl",":domain:account",1,0],[":features:tester:impl",":domain:card",1,0],[":features:tester:impl",":domain:feedback",1,0],[":features:tester:impl",":domain:markets:models",1,0],[":features:tester:impl",":domain:markets",1,0],[":features:tester:impl",":domain:manage-tokens:models",1,0],[":features:tester:impl",":domain:manage-tokens",1,0],[":features:tester:impl",":domain:wallets:models",1,0],[":features:tester:impl",":domain:wallets",1,0],[":features:tester:impl",":domain:feedback:models",1,0],[":features:tester:impl",":domain:settings",1,0],[":features:tester:impl",":data:common",1,0],[":features:tester:impl",":features:tester:api",1,0],[":features:tester:impl",":features:push-notifications:api",1,0],[":features:tester:impl",":features:survey:api",1,0],[":features:biometry:impl",":features:biometry:api",1,1],[":features:biometry:impl",":features:hot-wallet:api",1,0],[":features:biometry:impl",":domain:wallets",1,0],[":features:biometry:impl",":domain:models",1,1],[":features:biometry:impl",":domain:settings",1,0],[":features:biometry:impl",":domain:card",1,0],[":features:account:impl",":features:account:api",1,0],[":features:account:impl",":features:wallet:api",1,0],[":features:account:impl",":domain:models",1,0],[":features:account:impl",":domain:account",1,0],[":features:account:impl",":domain:account:status",1,0],[":features:account:impl",":domain:core",1,0],[":features:account:impl",":domain:app-currency",1,0],[":features:account:impl",":domain:app-currency:models",1,0],[":features:account:impl",":domain:tokens",1,0],[":features:account:impl",":domain:tokens:models",1,0],[":features:account:impl",":domain:balance-hiding",1,0],[":features:account:impl",":domain:balance-hiding:models",1,0],[":features:account:impl",":domain:wallets",1,0],[":features:account:impl",":domain:wallets:models",1,0],[":features:account:api",":domain:models",1,0],[":features:account:api",":domain:core",1,0],[":features:account:api",":domain:app-currency:models",1,0],[":features:account:api",":domain:tokens",1,0],[":features:account:api",":domain:tokens:models",1,0],[":features:account:api",":domain:account",1,0],[":features:hot-wallet:impl",":features:hot-wallet:api",1,0],[":features:hot-wallet:impl",":features:onboarding-v2:api",1,0],[":features:hot-wallet:impl",":features:push-notifications:api",1,0],[":features:hot-wallet:impl",":domain:card",1,0],[":features:hot-wallet:impl",":domain:models",2,0],[":features:hot-wallet:impl",":domain:wallets",1,0],[":features:hot-wallet:impl",":domain:wallets:models",1,0],[":features:hot-wallet:impl",":domain:settings",1,0],[":features:hot-wallet:impl",":domain:feedback",1,0],[":features:hot-wallet:impl",":domain:feedback:models",1,0],[":features:hot-wallet:impl",":domain:hot-wallet",1,0],[":features:hot-wallet:impl",":domain:assetsdiscovery",1,0],[":features:hot-wallet:api",":domain:models",1,0],[":features:hot-wallet:api",":domain:wallets",1,0],[":features:hot-wallet:api",":domain:wallets:models",1,0],[":features:survey:impl",":features:survey:api",1,0],[":features:survey:impl",":domain:common",1,0],[":features:survey:impl",":domain:models",1,0],[":features:survey:impl",":domain:wallets",1,0],[":features:survey:impl",":domain:wallets:models",1,0],[":features:send:impl",":features:send:api",1,0],[":features:send:impl",":features:txhistory:api",1,0],[":features:send:impl",":features:nft:api",1,0],[":features:send:impl",":features:swap-v2:api",1,0],[":features:send:impl",":features:manage-tokens:api",1,0],[":features:send:impl",":domain:models",1,0],[":features:send:impl",":domain:legacy",1,0],[":features:send:impl",":domain:offramp",1,0],[":features:send:impl",":domain:card",1,0],[":features:send:impl",":domain:tokens:models",1,0],[":features:send:impl",":domain:tokens",1,0],[":features:send:impl",":domain:wallets:models",1,0],[":features:send:impl",":domain:wallets",1,0],[":features:send:impl",":domain:app-currency:models",1,0],[":features:send:impl",":domain:app-currency",1,0],[":features:send:impl",":domain:transaction:models",1,0],[":features:send:impl",":domain:transaction",2,0],[":features:send:impl",":domain:txhistory:models",1,0],[":features:send:impl",":domain:txhistory",2,0],[":features:send:impl",":domain:qr-scanning:models",1,0],[":features:send:impl",":domain:qr-scanning",1,0],[":features:send:impl",":domain:settings",1,0],[":features:send:impl",":domain:feedback",1,0],[":features:send:impl",":domain:feedback:models",1,0],[":features:send:impl",":domain:balance-hiding:models",1,0],[":features:send:impl",":domain:balance-hiding",1,0],[":features:send:impl",":domain:nft:models",1,0],[":features:send:impl",":domain:nft",1,0],[":features:send:impl",":domain:notifications",1,0],[":features:send:impl",":domain:swap:models",1,0],[":features:send:impl",":domain:account",1,0],[":features:send:impl",":domain:account:status",1,0],[":features:send:api",":domain:transaction",1,0],[":features:send:api",":domain:models",1,1],[":features:send:api",":domain:app-currency:models",1,0],[":features:send:api",":domain:nft:models",1,0],[":features:send:api",":domain:tokens:models",1,0],[":features:send:api",":domain:transaction:models",1,0],[":features:send:api",":domain:wallets:models",1,0],[":features:send:api",":domain:staking:models",1,0],[":features:virtual-accounts:details:impl",":features:virtual-accounts:details:api",1,0],[":features:virtual-accounts:main:impl",":features:virtual-accounts:main:api",1,0],[":features:virtual-accounts:onboarding:impl",":features:virtual-accounts:onboarding:api",1,0],[":features:tangempay:details:impl",":features:tangempay:details:api",1,0],[":features:tangempay:details:impl",":features:token-recieve:api",1,0],[":features:tangempay:details:impl",":features:txhistory:api",1,0],[":features:tangempay:details:impl",":features:tokendetails:api",1,0],[":features:tangempay:details:impl",":domain:balance-hiding",1,0],[":features:tangempay:details:impl",":domain:balance-hiding:models",1,0],[":features:tangempay:details:impl",":domain:feedback",1,0],[":features:tangempay:details:impl",":domain:feedback:models",1,0],[":features:tangempay:details:impl",":domain:models",1,0],[":features:tangempay:details:impl",":domain:onramp:models",1,0],[":features:tangempay:details:impl",":domain:visa",1,0],[":features:tangempay:details:impl",":domain:visa:models",1,0],[":features:tangempay:details:impl",":domain:wallets",1,0],[":features:tangempay:details:api",":domain:models",1,0],[":features:tangempay:details:api",":domain:visa:models",1,0],[":features:tangempay:main:impl",":features:tangempay:main:api",1,0],[":features:tangempay:onboarding:impl",":features:tangempay:onboarding:api",1,0],[":features:tangempay:onboarding:impl",":features:tangempay:details:api",1,0],[":features:tangempay:onboarding:impl",":features:kyc:api",1,0],[":features:tangempay:onboarding:impl",":features:wallet:api",1,0],[":features:tangempay:onboarding:impl",":features:hot-wallet:api",1,0],[":features:tangempay:onboarding:impl",":domain:appsflyer",1,0],[":features:tangempay:onboarding:impl",":domain:visa",1,0],[":features:tangempay:onboarding:impl",":domain:wallets",1,0],[":features:tangempay:onboarding:impl",":domain:wallets:models",1,0],[":features:tangempay:onboarding:impl",":domain:hot-wallet",1,0],[":features:tangempay:onboarding:impl",":data:visa",1,0],[":features:tangempay:onboarding:api",":domain:models",1,0],[":features:approval:impl",":features:approval:api",1,0],[":features:approval:impl",":features:send:api",1,0],[":features:approval:impl",":domain:models",1,0],[":features:approval:impl",":domain:wallets",1,0],[":features:approval:impl",":domain:wallets:models",1,0],[":features:approval:impl",":domain:transaction:models",1,0],[":features:approval:impl",":domain:transaction",1,0],[":features:approval:api",":domain:models",1,0],[":features:approval:api",":domain:wallets:models",1,0],[":features:push-notification-settings:impl",":features:push-notification-settings:api",1,0],[":features:push-notification-settings:impl",":features:push-notifications:api",1,0],[":features:push-notification-settings:impl",":features:wallet-settings:api",1,0],[":features:push-notification-settings:impl",":domain:models",1,0],[":features:push-notification-settings:impl",":domain:account",1,0],[":features:push-notification-settings:impl",":domain:push-notification-preferences",1,0],[":features:push-notification-settings:api",":domain:models",1,0],[":data:transaction",":data:common",1,0],[":data:transaction",":domain:legacy",1,0],[":data:transaction",":domain:wallet-manager",1,0],[":data:transaction",":domain:wallets:models",1,0],[":data:transaction",":domain:tokens:models",1,0],[":data:transaction",":domain:transaction:models",1,0],[":data:transaction",":domain:transaction",1,0],[":data:transaction",":domain:demo",1,0],[":data:transaction",":features:send:api",1,0],[":data:settings",":domain:balance-hiding:models",1,0],[":data:settings",":domain:settings",1,0],[":data:dynamic-addresses",":data:common",1,0],[":data:dynamic-addresses",":domain:account",1,0],[":data:dynamic-addresses",":domain:common",1,0],[":data:dynamic-addresses",":domain:dynamic-addresses",1,0],[":data:dynamic-addresses",":domain:dynamic-addresses:models",1,0],[":data:dynamic-addresses",":domain:models",1,0],[":data:dynamic-addresses",":domain:wallet-manager",1,0],[":data:app-theme",":domain:app-theme",1,0],[":data:app-theme",":domain:app-theme:models",1,0],[":data:yield-supply",":domain:yield-supply",1,0],[":data:yield-supply",":domain:yield-supply:models",1,0],[":data:yield-supply",":domain:wallet-manager",1,0],[":data:yield-supply",":domain:legacy",1,0],[":data:yield-supply",":domain:txhistory:models",1,0],[":data:txhistory",":data:common",1,0],[":data:txhistory",":domain:legacy",1,0],[":data:txhistory",":domain:common",1,0],[":data:txhistory",":domain:wallet-manager",1,0],[":data:txhistory",":domain:models",1,0],[":data:txhistory",":domain:tokens:models",1,0],[":data:txhistory",":domain:txhistory",1,0],[":data:txhistory",":domain:txhistory:models",1,0],[":data:txhistory",":domain:express:models",1,0],[":data:txhistory",":domain:wallets:models",1,0],[":data:txhistory",":domain:wallets",1,0],[":data:txhistory",":domain:account",1,0],[":data:txhistory",":domain:account:status",1,0],[":data:push-notification-preferences",":domain:push-notification-preferences",1,0],[":data:push-notification-preferences",":domain:models",1,0],[":data:card",":domain:card",1,0],[":data:card",":domain:models",1,0],[":data:nft",":data:common",1,0],[":data:nft",":domain:card",1,0],[":data:nft",":domain:common",1,0],[":data:nft",":domain:models",1,0],[":data:nft",":domain:nft",1,0],[":data:nft",":domain:nft:models",1,0],[":data:nft",":domain:tokens:models",1,0],[":data:nft",":domain:wallet-manager",1,0],[":data:nft",":domain:wallets:models",1,0],[":data:nft",":domain:legacy",1,0],[":data:nft",":features:nft:api",1,0],[":data:quotes",":data:common",1,0],[":data:quotes",":domain:models",1,1],[":data:quotes",":domain:quotes",1,1],[":data:wallet-manager",":domain:wallets",1,0],[":data:wallet-manager",":domain:wallet-manager",1,0],[":data:wallet-manager",":domain:demo",1,0],[":data:wallet-manager",":domain:card",1,0],[":data:wallet-manager",":domain:transaction",1,0],[":data:wallet-manager",":domain:models",1,1],[":data:wallet-manager",":domain:wallets:models",1,0],[":data:wallet-manager",":domain:tokens:models",1,0],[":data:wallet-manager",":domain:txhistory:models",1,0],[":data:wallet-manager",":domain:transaction:models",1,0],[":data:express",":data:common",1,0],[":data:express",":domain:common",1,0],[":data:express",":domain:express:models",1,0],[":data:express",":domain:express",1,0],[":data:express",":domain:wallets:models",1,0],[":data:express",":domain:txhistory",1,0],[":data:express",":domain:models",1,1],[":data:payment",":data:common",1,0],[":data:payment",":data:wallets",1,0],[":data:payment",":domain:payment",1,0],[":data:payment",":domain:payment:models",1,0],[":data:payment",":domain:wallets",1,0],[":data:payment",":domain:models",1,0],[":data:payment",":domain:common",1,0],[":data:payment",":domain:legacy",1,0],[":data:qr-scanning",":domain:models",1,0],[":data:qr-scanning",":domain:qr-scanning",1,0],[":data:qr-scanning",":domain:qr-scanning:models",1,0],[":data:qr-scanning",":domain:tokens:models",1,0],[":data:blockaid",":data:common",1,0],[":data:blockaid",":domain:models",1,0],[":data:blockaid",":domain:blockaid",1,0],[":data:blockaid",":domain:blockaid:models",1,0],[":data:app-currency",":domain:core",1,0],[":data:app-currency",":domain:app-currency",1,0],[":data:app-currency",":domain:app-currency:models",1,0],[":data:app-currency",":data:common",1,0],[":data:swap",":data:common",1,0],[":data:swap",":data:express",1,0],[":data:swap",":domain:express:models",1,0],[":data:swap",":domain:express",1,0],[":data:swap",":domain:swap:models",1,0],[":data:swap",":domain:swap",1,0],[":data:swap",":domain:wallets:models",1,0],[":data:swap",":domain:wallets",1,0],[":data:swap",":domain:tokens:models",1,0],[":data:swap",":domain:tokens",1,0],[":data:swap",":domain:legacy",1,0],[":data:swap",":domain:models",1,0],[":data:swap",":domain:quotes",1,0],[":data:swap",":domain:networks",1,0],[":data:swap",":domain:staking:models",1,0],[":data:swap",":domain:staking",1,0],[":data:swap",":domain:account",1,0],[":data:earn",":data:common",1,0],[":data:earn",":domain:earn",1,0],[":data:earn",":domain:common",1,0],[":data:earn",":domain:account:status",1,0],[":data:wallet-connect",":domain:account",1,0],[":data:wallet-connect",":domain:account:status",1,0],[":data:wallet-connect",":domain:wallet-connect",1,0],[":data:wallet-connect",":domain:wallet-connect:models",1,0],[":data:wallet-connect",":domain:transaction",1,0],[":data:wallet-connect",":domain:transaction:models",1,0],[":data:wallet-connect",":domain:wallets",1,0],[":data:wallet-connect",":domain:wallets:models",1,0],[":data:wallet-connect",":domain:tokens",1,0],[":data:wallet-connect",":domain:tokens:models",1,0],[":data:wallet-connect",":domain:models",1,0],[":data:wallet-connect",":domain:legacy",1,0],[":data:wallet-connect",":domain:wallet-manager",1,0],[":data:wallet-connect",":data:common",1,0],[":data:wallet-connect",":domain:blockaid",1,0],[":data:wallet-connect",":domain:blockaid:models",1,0],[":data:visa",":data:common",1,0],[":data:visa",":data:wallets",1,0],[":data:visa",":domain:visa",1,0],[":data:visa",":domain:card",1,0],[":data:visa",":domain:wallets",1,0],[":data:visa",":domain:legacy",2,0],[":data:visa",":domain:models",1,0],[":data:visa",":domain:wallets:models",1,0],[":data:visa",":domain:app-currency:models",1,0],[":data:visa",":domain:tokens:models",1,0],[":data:visa",":domain:tokens",1,0],[":data:visa",":domain:networks",1,0],[":data:visa",":domain:wallet-manager",1,0],[":data:visa",":domain:quotes",1,0],[":data:visa",":domain:common",1,0],[":data:visa",":features:swap:domain",1,0],[":data:balance-hiding",":domain:balance-hiding",1,0],[":data:balance-hiding",":domain:balance-hiding:models",1,0],[":data:feedback",":features:hot-wallet:api",1,0],[":data:feedback",":domain:feedback",1,0],[":data:feedback",":domain:feedback:models",1,0],[":data:feedback",":domain:legacy",1,0],[":data:feedback",":domain:card",1,0],[":data:feedback",":domain:models",1,0],[":data:feedback",":domain:wallets",1,0],[":data:feedback",":domain:wallets:models",1,0],[":data:search",":data:common",1,0],[":data:search",":domain:search",1,0],[":data:search",":domain:common",1,0],[":data:search",":domain:account:status",1,0],[":data:search",":domain:markets:models",1,0],[":data:search",":domain:wallets",1,0],[":data:search",":domain:app-currency",1,0],[":data:onramp",":data:common",1,0],[":data:onramp",":domain:account",1,0],[":data:onramp",":domain:onramp",1,0],[":data:onramp",":domain:legacy",1,0],[":data:onramp",":domain:card",1,0],[":data:onramp",":domain:wallet-manager",1,0],[":data:onramp",":domain:app-theme:models",1,0],[":data:onramp",":domain:models",1,0],[":data:onramp",":domain:express:models",1,0],[":data:onramp",":domain:txhistory",1,0],[":data:networks",":data:common",1,0],[":data:networks",":data:dynamic-addresses",1,0],[":data:networks",":domain:card",1,0],[":data:networks",":domain:common",1,0],[":data:networks",":domain:legacy",1,0],[":data:networks",":domain:models",1,0],[":data:networks",":domain:networks",1,0],[":data:networks",":domain:wallet-manager",1,0],[":data:common",":domain:account",1,0],[":data:common",":domain:demo",1,0],[":data:common",":domain:legacy",1,0],[":data:common",":domain:card",1,0],[":data:common",":domain:models",1,0],[":data:common",":domain:tokens:models",1,0],[":data:common",":domain:wallets:models",1,0],[":data:common",":domain:express:models",1,0],[":data:common",":domain:networks",1,0],[":data:common",":domain:wallet-manager",1,0],[":data:common",":domain:wallets",1,0],[":data:stories",":domain:stories",1,0],[":data:stories",":domain:stories:models",1,0],[":data:stories",":domain:models",1,1],[":data:stories",":domain:wallets:models",1,0],[":data:stories",":features:referral:domain",1,0],[":data:news",":data:common",1,0],[":data:news",":domain:news",1,0],[":data:manage-tokens",":domain:account",1,0],[":data:manage-tokens",":domain:demo",1,0],[":data:manage-tokens",":domain:models",1,0],[":data:manage-tokens",":domain:manage-tokens",1,0],[":data:manage-tokens",":domain:card",1,0],[":data:manage-tokens",":domain:wallets",1,0],[":data:manage-tokens",":domain:tokens:models",1,0],[":data:manage-tokens",":domain:wallets:models",1,0],[":data:manage-tokens",":domain:legacy",2,0],[":data:manage-tokens",":data:common",1,0],[":data:manage-tokens",":data:tokens",1,0],[":data:markets",":domain:legacy",1,0],[":data:markets",":domain:markets",1,0],[":data:markets",":domain:models",1,0],[":data:markets",":domain:tokens:models",1,0],[":data:markets",":domain:tokens",1,0],[":data:markets",":data:common",1,0],[":data:staking",":data:common",1,0],[":data:staking",":domain:tokens:models",1,0],[":data:staking",":domain:staking",1,0],[":data:staking",":domain:wallets",1,0],[":data:staking",":domain:wallets:models",1,0],[":data:staking",":domain:legacy",1,0],[":data:staking",":domain:wallet-manager",1,0],[":data:staking",":domain:card",1,0],[":data:staking",":domain:models",1,0],[":data:staking",":features:staking:api",1,0],[":data:address-book",":domain:address-book",1,0],[":data:address-book",":domain:common",1,0],[":data:address-book",":domain:models",1,0],[":data:assetsdiscovery",":domain:assetsdiscovery",1,1],[":data:assetsdiscovery",":domain:tokens",1,0],[":data:assetsdiscovery",":domain:tokens:models",1,0],[":data:assetsdiscovery",":domain:models",1,0],[":data:assetsdiscovery",":domain:wallet-manager",1,0],[":data:assetsdiscovery",":domain:wallets",1,0],[":data:assetsdiscovery",":data:common",1,0],[":data:assetsdiscovery",":data:wallet-manager",1,0],[":data:wallets",":data:common",1,0],[":data:wallets",":domain:account",1,0],[":data:wallets",":domain:card",1,0],[":data:wallets",":domain:dynamic-addresses",1,0],[":data:wallets",":domain:models",1,0],[":data:wallets",":domain:tokens:models",1,0],[":data:wallets",":domain:wallets",1,0],[":data:wallets",":domain:wallets:models",1,0],[":data:wallets",":domain:settings",1,0],[":data:account",":features:virtual-accounts:details:api",1,0],[":data:account",":domain:account",1,1],[":data:account",":domain:card",1,1],[":data:account",":domain:common",1,1],[":data:account",":domain:models",1,1],[":data:account",":domain:tokens",1,1],[":data:account",":domain:wallets",1,1],[":data:account",":domain:visa",1,1],[":data:account",":data:common",1,0],[":data:hot-wallet",":domain:hot-wallet",1,0],[":data:hot-wallet",":domain:models",1,0],[":data:appsflyer",":domain:appsflyer",1,0],[":data:tokens",":data:common",1,0],[":data:tokens",":data:networks",1,0],[":data:tokens",":domain:account",1,0],[":data:tokens",":domain:card",1,0],[":data:tokens",":domain:common",1,0],[":data:tokens",":domain:core",1,0],[":data:tokens",":domain:demo",1,0],[":data:tokens",":domain:express",1,0],[":data:tokens",":domain:legacy",1,0],[":data:tokens",":domain:models",1,0],[":data:tokens",":domain:staking",1,0],[":data:tokens",":domain:staking:models",1,0],[":data:tokens",":domain:tokens",1,0],[":data:tokens",":domain:tokens:models",1,0],[":data:tokens",":domain:txhistory:models",1,0],[":data:tokens",":domain:wallet-manager",1,0],[":data:tokens",":domain:transaction",1,0],[":data:tokens",":domain:wallets:models",1,0],[":data:tokens",":features:send:api",1,0],[":data:notifications",":domain:notifications:models",1,0],[":data:notifications",":domain:notifications",1,0],[":data:onboarding",":domain:onboarding",1,0],[":data:onboarding",":domain:models",1,0],[":data:analytics",":domain:analytics",1,0],[":data:analytics",":domain:models",1,0],[":data:analytics",":domain:wallets:models",1,0],[":data:analytics",":data:common",1,0],[":domain:demo",":domain:demo:models",1,1],[":domain:transaction",":domain:account:status",1,0],[":domain:transaction",":domain:common",1,0],[":domain:transaction",":domain:dynamic-addresses",1,0],[":domain:transaction",":domain:dynamic-addresses:models",1,0],[":domain:transaction",":domain:models",1,0],[":domain:transaction",":domain:legacy",1,0],[":domain:transaction",":domain:wallet-manager",1,0],[":domain:transaction",":domain:wallets:models",1,0],[":domain:transaction",":domain:tokens",1,0],[":domain:transaction",":domain:tokens:models",1,0],[":domain:transaction",":domain:transaction:models",1,0],[":domain:transaction",":domain:demo",1,0],[":domain:transaction",":domain:card",1,0],[":domain:transaction",":domain:notifications",1,0],[":domain:transaction",":domain:networks",1,1],[":domain:settings",":domain:balance-hiding:models",1,0],[":domain:settings",":domain:wallets:models",1,0],[":domain:dynamic-addresses",":domain:core",1,1],[":domain:dynamic-addresses",":domain:dynamic-addresses:models",1,1],[":domain:dynamic-addresses",":domain:models",1,0],[":domain:dynamic-addresses",":domain:wallet-manager",1,0],[":domain:dynamic-addresses",":domain:wallets",1,0],[":domain:app-theme",":domain:core",1,0],[":domain:app-theme",":domain:app-theme:models",1,0],[":domain:yield-supply",":domain:account:status",1,0],[":domain:yield-supply",":domain:models",1,0],[":domain:yield-supply",":domain:yield-supply:models",1,0],[":domain:yield-supply",":domain:transaction:models",1,0],[":domain:yield-supply",":domain:transaction",1,0],[":domain:yield-supply",":domain:legacy",1,0],[":domain:yield-supply",":domain:blockaid:models",1,0],[":domain:yield-supply",":domain:blockaid",1,0],[":domain:yield-supply",":domain:quotes",1,0],[":domain:yield-supply",":domain:tokens",1,0],[":domain:yield-supply",":domain:app-currency:models",1,0],[":domain:yield-supply:models",":domain:models",1,1],[":domain:txhistory",":domain:core",1,0],[":domain:txhistory",":domain:express:models",1,1],[":domain:txhistory",":domain:models",1,0],[":domain:txhistory",":domain:tokens:models",1,0],[":domain:txhistory",":domain:txhistory:models",1,0],[":domain:txhistory",":domain:wallets:models",1,0],[":domain:txhistory",":domain:visa:models",1,0],[":domain:push-notification-preferences",":domain:models",1,0],[":domain:card",":domain:demo",1,0],[":domain:card",":domain:core",1,0],[":domain:card",":domain:legacy",1,0],[":domain:card",":domain:wallet-manager",1,0],[":domain:card",":domain:models",1,0],[":domain:card",":domain:tokens:models",1,0],[":domain:card",":domain:wallets:models",1,0],[":domain:card",":domain:visa:models",1,0],[":domain:nft",":domain:core",1,0],[":domain:nft",":domain:account",1,0],[":domain:nft",":domain:models",1,0],[":domain:nft",":domain:networks",1,0],[":domain:nft",":domain:nft:models",1,0],[":domain:nft",":domain:quotes",1,0],[":domain:nft",":domain:tokens",1,0],[":domain:nft",":domain:tokens:models",1,0],[":domain:nft",":domain:wallets",1,0],[":domain:nft",":domain:wallets:models",1,0],[":domain:nft:models",":domain:core",1,0],[":domain:nft:models",":domain:models",1,0],[":domain:nft:models",":domain:tokens:models",1,0],[":domain:quotes",":domain:core",1,1],[":domain:quotes",":domain:models",1,1],[":domain:wallet-manager",":domain:wallet-manager:models",1,1],[":domain:wallet-manager",":domain:models",1,1],[":domain:wallet-manager",":domain:core",1,0],[":domain:wallet-manager",":domain:demo:models",1,0],[":domain:wallet-manager",":domain:wallets:models",1,0],[":domain:wallet-manager",":domain:tokens:models",1,0],[":domain:wallet-manager",":domain:app-currency:models",1,0],[":domain:wallet-manager",":domain:transaction:models",1,0],[":domain:wallet-manager",":domain:txhistory:models",1,0],[":domain:wallet-manager:models",":domain:models",1,0],[":domain:express",":domain:express:models",1,1],[":domain:express",":domain:models",1,1],[":domain:express:models",":domain:tokens:models",1,0],[":domain:payment",":domain:models",1,1],[":domain:payment",":domain:payment:models",1,0],[":domain:payment:models",":domain:models",1,0],[":domain:qr-scanning",":domain:models",1,1],[":domain:qr-scanning",":domain:account",1,0],[":domain:qr-scanning",":domain:common",1,0],[":domain:qr-scanning",":domain:networks",1,0],[":domain:qr-scanning",":domain:qr-scanning:models",1,0],[":domain:qr-scanning",":domain:tokens:models",1,0],[":domain:qr-scanning:models",":domain:models",1,0],[":domain:blockaid",":domain:models",1,0],[":domain:blockaid",":domain:core",1,0],[":domain:blockaid",":domain:blockaid:models",1,0],[":domain:app-currency",":domain:core",1,0],[":domain:app-currency",":domain:app-currency:models",1,0],[":domain:swap",":domain:models",1,0],[":domain:swap",":domain:express:models",1,0],[":domain:swap",":domain:swap:models",1,0],[":domain:swap",":domain:wallets:models",1,0],[":domain:swap",":domain:tokens:models",1,0],[":domain:swap:models",":domain:models",1,0],[":domain:swap:models",":domain:express:models",1,0],[":domain:swap:models",":domain:tokens:models",1,0],[":domain:legacy",":domain:core",1,0],[":domain:legacy",":domain:demo",1,0],[":domain:legacy",":domain:models",1,0],[":domain:legacy",":domain:tokens:models",1,0],[":domain:legacy",":domain:transaction:models",1,0],[":domain:legacy",":domain:txhistory:models",1,0],[":domain:legacy",":domain:wallets:models",1,0],[":domain:earn",":domain:core",1,1],[":domain:earn",":domain:models",1,1],[":domain:earn",":domain:account",1,0],[":domain:earn",":domain:common",1,0],[":domain:wallet-connect",":domain:blockaid:models",1,0],[":domain:wallet-connect",":domain:core",1,0],[":domain:wallet-connect",":domain:models",1,0],[":domain:wallet-connect",":domain:tokens:models",1,0],[":domain:wallet-connect",":domain:wallets:models",1,0],[":domain:wallet-connect",":domain:wallet-connect:models",1,0],[":domain:wallet-connect",":domain:transaction",1,0],[":domain:wallet-connect",":domain:transaction:models",1,0],[":domain:wallet-connect:models",":domain:models",1,0],[":domain:wallet-connect:models",":domain:wallets:models",1,0],[":domain:wallet-connect:models",":domain:tokens:models",1,0],[":domain:wallet-connect:models",":domain:blockaid:models",1,0],[":domain:wallet-connect:models",":domain:transaction:models",1,0],[":domain:models",":domain:core",1,1],[":domain:visa",":domain:models",1,1],[":domain:visa",":domain:visa:models",1,1],[":domain:visa",":domain:app-currency:models",1,0],[":domain:visa",":domain:core",1,0],[":domain:visa",":domain:tokens:models",1,0],[":domain:visa",":domain:wallets:models",1,0],[":domain:visa:models",":domain:models",1,0],[":domain:balance-hiding",":domain:core",1,0],[":domain:balance-hiding",":domain:settings",1,0],[":domain:balance-hiding",":domain:balance-hiding:models",1,0],[":domain:feedback",":domain:models",1,0],[":domain:feedback",":domain:wallets:models",1,0],[":domain:feedback",":domain:visa:models",1,0],[":domain:feedback",":domain:feedback:models",1,0],[":domain:feedback:models",":domain:models",1,0],[":domain:feedback:models",":domain:wallets:models",1,0],[":domain:feedback:models",":domain:visa:models",1,0],[":domain:search",":domain:core",1,1],[":domain:search",":domain:models",1,1],[":domain:search",":domain:common",1,0],[":domain:search",":domain:markets:models",1,0],[":domain:search",":domain:wallets",1,0],[":domain:search",":domain:app-currency",1,0],[":domain:search",":domain:account",1,0],[":domain:search",":domain:account:status",1,0],[":domain:onramp",":domain:onramp:models",1,1],[":domain:onramp",":domain:tokens:models",1,1],[":domain:onramp",":domain:wallets:models",1,1],[":domain:onramp",":domain:core",1,1],[":domain:onramp",":domain:settings",1,1],[":domain:onramp",":domain:stories",1,0],[":domain:onramp:models",":domain:models",1,1],[":domain:onramp:models",":domain:core",1,0],[":domain:onramp:models",":domain:tokens:models",1,0],[":domain:onramp:models",":domain:wallets:models",1,0],[":domain:networks",":domain:core",1,1],[":domain:networks",":domain:models",1,1],[":domain:networks",":domain:wallets:models",1,1],[":domain:common",":domain:models",1,1],[":domain:stories",":domain:models",1,0],[":domain:stories",":domain:stories:models",1,0],[":domain:stories",":domain:settings",1,0],[":domain:stories",":domain:wallets:models",1,0],[":domain:news",":domain:core",1,1],[":domain:news",":domain:models",1,1],[":domain:manage-tokens",":domain:core",1,1],[":domain:manage-tokens",":domain:manage-tokens:models",1,1],[":domain:manage-tokens",":domain:networks",1,1],[":domain:manage-tokens",":domain:quotes",1,1],[":domain:manage-tokens",":domain:wallet-manager",1,1],[":domain:manage-tokens",":domain:wallets:models",1,0],[":domain:manage-tokens",":domain:tokens:models",1,0],[":domain:manage-tokens",":domain:staking",1,0],[":domain:manage-tokens",":domain:tokens",1,0],[":domain:manage-tokens",":domain:card",1,0],[":domain:manage-tokens",":domain:wallets",1,0],[":domain:manage-tokens",":domain:legacy",1,0],[":domain:manage-tokens:models",":domain:models",1,0],[":domain:manage-tokens:models",":domain:tokens:models",1,0],[":domain:markets",":domain:app-currency:models",1,1],[":domain:markets",":domain:card",1,1],[":domain:markets",":domain:core",1,1],[":domain:markets",":domain:legacy",1,1],[":domain:markets",":domain:markets:models",1,1],[":domain:markets",":domain:models",1,1],[":domain:markets",":domain:networks",1,1],[":domain:markets",":domain:staking",1,1],[":domain:markets",":domain:quotes",1,1],[":domain:markets",":domain:wallet-manager",1,1],[":domain:markets",":domain:wallets",1,1],[":domain:markets",":domain:wallets:models",1,1],[":domain:markets",":domain:stories",1,1],[":domain:markets",":domain:tokens:models",1,0],[":domain:markets",":domain:tokens",1,0],[":domain:markets",":domain:settings",1,0],[":domain:markets:models",":domain:models",1,1],[":domain:markets:models",":domain:tokens:models",1,1],[":domain:markets:models",":domain:core",1,0],[":domain:staking",":domain:staking:models",1,1],[":domain:staking",":domain:core",1,1],[":domain:staking",":domain:legacy",1,0],[":domain:staking",":domain:wallet-manager",1,0],[":domain:staking",":domain:models",1,0],[":domain:staking",":domain:tokens:models",1,0],[":domain:staking",":domain:wallets:models",1,0],[":domain:staking:models",":domain:core",1,0],[":domain:staking:models",":domain:models",1,0],[":domain:offramp",":domain:core",1,1],[":domain:offramp",":domain:models",1,1],[":domain:address-book",":domain:core",1,1],[":domain:address-book",":domain:models",1,1],[":domain:address-book",":domain:transaction",1,0],[":domain:address-book",":domain:tokens",1,0],[":domain:assetsdiscovery",":domain:core",1,1],[":domain:assetsdiscovery",":domain:models",1,0],[":domain:assetsdiscovery",":domain:account:status",1,0],[":domain:wallets",":domain:core",1,1],[":domain:wallets",":domain:common",1,1],[":domain:wallets",":domain:legacy",1,0],[":domain:wallets",":domain:wallet-manager",1,0],[":domain:wallets",":domain:account",1,0],[":domain:wallets",":domain:models",1,0],[":domain:wallets",":domain:tokens",1,0],[":domain:wallets",":domain:card",1,0],[":domain:wallets",":domain:tokens:models",1,0],[":domain:wallets",":domain:wallets:models",1,0],[":domain:wallets",":domain:notifications:models",1,0],[":domain:wallets",":domain:demo:models",1,0],[":domain:wallets",":domain:hot-wallet",1,0],[":domain:wallets",":domain:qr-scanning",1,0],[":domain:wallets",":domain:qr-scanning:models",1,0],[":domain:wallets:models",":domain:models",1,0],[":domain:account",":domain:common",1,1],[":domain:account",":domain:core",1,1],[":domain:account",":domain:models",1,1],[":domain:account",":domain:wallets:models",1,1],[":domain:account",":domain:yield-supply:models",1,1],[":domain:account:status",":domain:account",1,1],[":domain:account:status",":domain:card",1,1],[":domain:account:status",":domain:core",1,1],[":domain:account:status",":domain:common",1,1],[":domain:account:status",":domain:express",1,1],[":domain:account:status",":domain:quotes",1,1],[":domain:account:status",":domain:models",1,1],[":domain:account:status",":domain:networks",1,1],[":domain:account:status",":domain:nft",1,1],[":domain:account:status",":domain:referral",1,1],[":domain:account:status",":domain:staking",1,1],[":domain:account:status",":domain:tokens",1,1],[":domain:account:status",":domain:tokens:models",1,1],[":domain:account:status",":domain:visa",1,1],[":domain:account:status",":domain:wallet-manager",1,1],[":domain:account:status",":domain:wallets",1,1],[":domain:hot-wallet",":domain:core",1,0],[":domain:hot-wallet",":domain:models",1,0],[":domain:hot-wallet",":domain:wallets:models",1,0],[":domain:tokens",":domain:core",1,1],[":domain:tokens",":domain:common",1,0],[":domain:tokens",":domain:card",1,0],[":domain:tokens",":domain:express",1,0],[":domain:tokens",":domain:models",1,0],[":domain:tokens",":domain:legacy",1,0],[":domain:tokens",":domain:wallet-manager",1,0],[":domain:tokens",":domain:staking",1,0],[":domain:tokens",":domain:visa",1,0],[":domain:tokens",":domain:tokens:models",1,0],[":domain:tokens",":domain:txhistory:models",1,0],[":domain:tokens",":domain:transaction:models",1,0],[":domain:tokens",":domain:wallets:models",1,0],[":domain:tokens",":domain:app-currency:models",1,0],[":domain:tokens",":domain:onramp:models",1,0],[":domain:tokens",":domain:settings",1,0],[":domain:tokens",":features:swap:domain:api",1,0],[":domain:tokens",":features:swap:domain:models",1,0],[":domain:tokens",":domain:stories:models",1,0],[":domain:tokens",":domain:stories",1,0],[":domain:tokens",":domain:networks",1,0],[":domain:tokens",":domain:quotes",1,0],[":domain:tokens",":domain:yield-supply:models",1,0],[":domain:tokens",":features:staking:api",1,0],[":domain:tokens",":features:markets:api",1,0],[":domain:tokens",":features:swap:api",1,0],[":domain:tokens",":features:virtual-accounts:details:api",1,0],[":domain:tokens:models",":domain:models",1,0],[":domain:tokens:models",":domain:txhistory:models",1,0],[":domain:tokens:models",":domain:staking:models",1,0],[":domain:tokens:models",":domain:stories:models",1,0],[":domain:notifications",":domain:core",1,0],[":domain:notifications",":domain:models",1,0],[":domain:notifications",":domain:notifications:models",1,0],[":domain:notifications",":domain:wallets:models",1,0],[":domain:notifications",":domain:tokens:models",1,0],[":domain:onboarding",":domain:models",1,0],[":domain:analytics",":domain:core",1,0],[":domain:analytics",":domain:models",1,0],[":domain:analytics",":domain:wallets:models",1,0]]} +``` + + + +```json +{"n":[["AccessCodeRecovery","AccessCodeRecovery","onboarding",1,0],["AccountDetails","AccountDetails","portfolio",1,0],["AddExistingWallet","AddExistingWallet","onboarding",1,0],["AddressBook","AddressBook","settings",1,0],["AppCurrencySelector","AppCurrencySelector","settings",1,0],["AppSettings","AppSettings","settings",2,0],["ArchivedAccountList","ArchivedAccountList","portfolio",1,0],["BuyCrypto","BuyCrypto","tokenaction",1,0],["CardSettings","CardSettings","settings",1,0],["ChooseManagedTokens","ChooseManagedTokens","portfolio",1,0],["CreateAccount","CreateAccount","portfolio",1,0],["CreateHardwareWallet","CreateHardwareWallet","onboarding",2,0],["CreateMobileWallet","CreateMobileWallet","onboarding",2,0],["CreateWalletBackup","CreateWalletBackup","onboarding",3,0],["CreateWalletSelection","CreateWalletSelection","onboarding",2,2],["CreateWalletStart","CreateWalletStart","onboarding",1,3],["CurrencyDetails","CurrencyDetails","portfolio",6,5],["Details","Details","settings",2,10],["DetailsSecurity","DetailsSecurity","settings",1,0],["Disclaimer","Disclaimer","entry",4,2],["Earn","Earn","markets",0,6],["EditAccount","EditAccount","portfolio",0,0],["ForgetWallet","ForgetWallet","settings",1,0],["Home","Home","entry",8,3],["Initial","Initial","entry",0,9],["Kyc","Kyc","tangempay",0,0],["ManageTokens","ManageTokens","portfolio",2,1],["Markets","Markets","markets",1,1],["MarketsTokenDetails","MarketsTokenDetails","markets",3,0],["NFT","NFT","wallet",1,1],["NFTSend","NFTSend","wallet",1,0],["News","News","markets",1,0],["NewsDetails","NewsDetails","markets",1,0],["Onboarding","Onboarding","onboarding",6,3],["Onramp","Onramp","tokenaction",3,3],["OnrampSuccess","OnrampSuccess","tokenaction",0,0],["PushNotification","PushNotification","wallet",1,0],["PushNotificationSettings","PushNotificationSettings","wallet",1,0],["QrScanning","QrScanning","misc",3,0],["ReferralProgram","ReferralProgram","settings",1,0],["ResetToFactory","ResetToFactory","settings",1,0],["SellCrypto","SellCrypto","tokenaction",1,0],["Send","Send","tokenaction",1,2],["SendEntryPoint","SendEntryPoint","tokenaction",2,0],["Staking","Staking","tokenaction",3,1],["Stories","Stories","wallet",2,0],["Survey","Survey","misc",0,0],["Swap","Swap","tokenaction",6,1],["TangemPayDetails","TangemPayDetails","tangempay",2,0],["TangemPayHotWalletOnboarding","TangemPayHotWalletOnboarding","tangempay",0,0],["TangemPayOnboarding","TangemPayOnboarding","tangempay",2,6],["UpdateAccessCode","UpdateAccessCode","onboarding",1,0],["UpgradeWallet","UpgradeWallet","onboarding",0,11],["Usedesk","Usedesk","misc",1,0],["ViewPhrase","ViewPhrase","onboarding",2,0],["Wallet","Wallet","wallet",9,14],["WalletActivation","WalletActivation","onboarding",1,0],["WalletBackup","WalletBackup","onboarding",1,0],["WalletConnectSessions","WalletConnectSessions","settings",1,1],["WalletHardwareBackup","WalletHardwareBackup","onboarding",2,0],["WalletSettings","WalletSettings","settings",1,15],["Welcome","Welcome","entry",1,3],["YieldSupplyEntry","YieldSupplyEntry","tokenaction",3,2],["AppShell","App shell","shell",0,7]],"e":[["Initial","AppSettings",1,0],["Initial","Wallet",4,0],["Initial","Welcome",2,0],["Initial","DetailsSecurity",1,0],["Initial","AccessCodeRecovery",1,0],["Initial","Onboarding",2,0],["Initial","ResetToFactory",1,0],["Initial","Home",1,0],["Initial","AppCurrencySelector",1,0],["Home","ManageTokens",1,0],["Home","CreateWalletStart",1,0],["Home","Wallet",2,0],["CreateWalletStart","CreateMobileWallet",2,0],["CreateWalletStart","Wallet",3,0],["CreateWalletStart","Onboarding",1,0],["YieldSupplyEntry","CurrencyDetails",2,0],["YieldSupplyEntry","Stories",2,0],["WalletSettings","AccountDetails",1,0],["WalletSettings","ArchivedAccountList",1,0],["WalletSettings","CreateAccount",1,0],["WalletSettings","ManageTokens",1,0],["WalletSettings","PushNotificationSettings",1,0],["WalletSettings","Home",1,0],["WalletSettings","Onboarding",1,0],["WalletSettings","ReferralProgram",1,0],["WalletSettings","UpdateAccessCode",1,0],["WalletSettings","WalletHardwareBackup",1,0],["WalletSettings","WalletBackup",1,0],["WalletSettings","CardSettings",1,0],["WalletSettings","CreateWalletBackup",2,0],["WalletSettings","ForgetWallet",2,0],["WalletSettings","ViewPhrase",1,0],["Disclaimer","PushNotification",1,0],["Disclaimer","Home",1,0],["NFT","NFTSend",1,0],["CurrencyDetails","Wallet",2,0],["CurrencyDetails","Onramp",3,0],["CurrencyDetails","SendEntryPoint",1,0],["CurrencyDetails","Swap",2,0],["CurrencyDetails","Staking",1,0],["Swap","Stories",1,0],["Details","WalletConnectSessions",4,0],["Details","AddressBook",2,0],["Details","Wallet",1,0],["Details","Onboarding",2,0],["Details","TangemPayOnboarding",2,0],["Details","Usedesk",2,0],["Details","AppSettings",1,0],["Details","Disclaimer",1,0],["Details","CreateWalletSelection",1,0],["Details","WalletSettings",2,0],["CreateWalletSelection","CreateMobileWallet",1,0],["CreateWalletSelection","CreateHardwareWallet",1,0],["Welcome","Home",1,0],["Welcome","Wallet",6,0],["Welcome","CreateWalletSelection",1,0],["AppShell","CurrencyDetails",1,0],["Onramp","Swap",1,0],["Onramp","SellCrypto",1,0],["Onramp","BuyCrypto",1,0],["WalletConnectSessions","QrScanning",1,0],["Onboarding","Wallet",7,0],["Onboarding","Home",1,0],["Onboarding","Disclaimer",1,0],["AppShell","ChooseManagedTokens",1,0],["ManageTokens","Swap",1,0],["Markets","MarketsTokenDetails",1,0],["Earn","YieldSupplyEntry",2,0],["Earn","News",5,0],["Earn","NewsDetails",4,0],["Earn","CurrencyDetails",5,0],["Earn","Markets",4,0],["Earn","MarketsTokenDetails",2,0],["Staking","CurrencyDetails",1,0],["Wallet","Details",1,0],["Wallet","Onboarding",1,0],["Wallet","CurrencyDetails",1,0],["Wallet","Home",1,0],["Wallet","NFT",1,0],["Wallet","TangemPayOnboarding",1,0],["Wallet","TangemPayDetails",1,0],["Wallet","YieldSupplyEntry",1,0],["Wallet","QrScanning",1,0],["Wallet","Send",1,0],["Wallet","Onramp",1,0],["Wallet","MarketsTokenDetails",1,0],["Wallet","Staking",1,0],["Wallet","Swap",1,0],["UpgradeWallet","ViewPhrase",3,0],["UpgradeWallet","WalletActivation",2,0],["UpgradeWallet","WalletHardwareBackup",2,0],["UpgradeWallet","Disclaimer",1,0],["UpgradeWallet","AddExistingWallet",1,0],["UpgradeWallet","Wallet",4,0],["UpgradeWallet","CreateWalletBackup",1,0],["UpgradeWallet","CreateHardwareWallet",1,0],["UpgradeWallet","Onboarding",1,0],["UpgradeWallet","Details",1,0],["UpgradeWallet","Home",1,0],["Send","QrScanning",1,0],["Send","CurrencyDetails",1,0],["TangemPayOnboarding","Swap",3,0],["TangemPayOnboarding","Disclaimer",2,0],["TangemPayOnboarding","Home",2,0],["TangemPayOnboarding","CreateWalletBackup",2,0],["TangemPayOnboarding","Wallet",5,0],["TangemPayOnboarding","TangemPayDetails",1,0],["AppShell","Onramp",1,0],["AppShell","Swap",1,0],["AppShell","SendEntryPoint",2,0],["AppShell","Staking",1,0],["AppShell","YieldSupplyEntry",1,0]]} +``` + + + +```json +{"AccessCodeRecovery":{"path":"/access_code_recovery","owner":"features:onboarding-v2","group":"onboarding","total":2,"refs":[["app",2]]},"AccountDetails":{"path":"/account_details/${account.accountId.value}","owner":"features:account","group":"portfolio","total":2,"refs":[["app",1],["features:wallet-settings",1]]},"AddExistingWallet":{"path":"/add_existing_wallet","owner":"features:onboarding-v2","group":"onboarding","total":2,"refs":[["app",1],["features:hot-wallet",1]]},"AddressBook":{"path":"/address_book/${addressBookOpenMode.address}-${addressBookOpenMode.networkId}","owner":"features:address-book","group":"settings","total":4,"refs":[["features:details",2],["app",1],["common:routing",1]]},"AppCurrencySelector":{"path":"/app_currency_selector","owner":"features:wallet-settings","group":"settings","total":2,"refs":[["app",2]]},"AppSettings":{"path":"/app_settings","owner":"features:details","group":"settings","total":5,"refs":[["app",4],["features:details",1]]},"ArchivedAccountList":{"path":"/archived_account/${userWalletId.stringValue}","owner":"features:account","group":"portfolio","total":2,"refs":[["app",1],["features:wallet-settings",1]]},"BuyCrypto":{"path":"/buy_crypto/${userWalletId.stringValue}","owner":"features:onramp","group":"tokenaction","total":3,"refs":[["app",1],["features:onramp",1],["features:wallet",1]]},"CardSettings":{"path":"/card_settings/${userWalletId.stringValue}","owner":"features:details","group":"settings","total":2,"refs":[["app",1],["features:wallet-settings",1]]},"ChooseManagedTokens":{"path":"/$source/choose_managed_tokens/$userWalletId/${initialCurrency.id.value}","owner":"features:manage-tokens","group":"portfolio","total":3,"refs":[["features:swap-v2",2],["app",1]]},"CreateAccount":{"path":"/create_account/${userWalletId.stringValue}","owner":"features:account","group":"portfolio","total":2,"refs":[["app",1],["features:wallet-settings",1]]},"CreateHardwareWallet":{"path":"/create_hardware_wallet","owner":"features:onboarding-v2","group":"onboarding","total":3,"refs":[["app",1],["features:create-wallet-selection",1],["features:hot-wallet",1]]},"CreateMobileWallet":{"path":"/create_mobile_wallet","owner":"features:hot-wallet","group":"onboarding","total":4,"refs":[["features:create-wallet-start",2],["app",1],["features:create-wallet-selection",1]]},"CreateWalletBackup":{"path":"/create_wallet_backup/${userWalletId.stringValue}","owner":"features:onboarding-v2","group":"onboarding","total":6,"refs":[["features:wallet-settings",2],["features:tangempay",2],["app",1],["features:hot-wallet",1]]},"CreateWalletSelection":{"path":"/create_wallet_selection","owner":"features:create-wallet-selection","group":"onboarding","total":3,"refs":[["app",1],["features:details",1],["features:welcome",1]]},"CreateWalletStart":{"path":"/create_wallet_start","owner":"features:create-wallet-start","group":"onboarding","total":8,"refs":[["app",5],["features:home",3]]},"CurrencyDetails":{"path":"/currency_details/${userWalletId.stringValue}/${currency.id.value}","owner":"features:tokendetails","group":"portfolio","total":18,"refs":[["features:feed",5],["features:tokendetails",4],["features:yield-supply",2],["features:swap",2],["app",1],["features:common-features",1],["features:staking",1],["features:wallet",1],["features:send",1]]},"Details":{"path":"/details/${userWalletId.stringValue}","owner":"features:details","group":"settings","total":3,"refs":[["app",1],["features:wallet",1],["features:hot-wallet",1]]},"DetailsSecurity":{"path":"/details/security","owner":"features:details","group":"settings","total":2,"refs":[["app",2]]},"Disclaimer":{"path":"/disclaimer${if (isTosAccepted) \"/tos_accepted\" else \"\"}","owner":"features:disclaimer","group":"entry","total":8,"refs":[["app",2],["features:tangempay",2],["features:details",1],["features:walletconnect",1],["features:onboarding-v2",1],["features:hot-wallet",1]]},"Earn":{"path":"/earn","owner":"features:feed","group":"markets","total":16,"refs":[["features:feed",15],["app",1]]},"EditAccount":{"path":"/edit_account/${account.accountId.value}","owner":"features:account","group":"portfolio","total":2,"refs":[["app",1],["features:account",1]]},"ForgetWallet":{"path":"/forget_wallet/${userWalletId.stringValue}","owner":"features:wallet-settings","group":"settings","total":3,"refs":[["features:wallet-settings",2],["app",1]]},"Home":{"path":"/home","owner":"features:home","group":"entry","total":14,"refs":[["app",6],["features:tangempay",2],["features:wallet-settings",1],["features:disclaimer",1],["features:welcome",1],["features:onboarding-v2",1],["features:wallet",1],["features:hot-wallet",1]]},"Initial":{"path":"/initial","owner":"app","group":"entry","total":6,"refs":[["app",5],["features:walletconnect",1]]},"Kyc":{"path":"/kyc","owner":"features:kyc","group":"tangempay","total":2,"refs":[["app",1],["features:tangempay",1]]},"ManageTokens":{"path":"${source.name.lowercase()}/manage_tokens/${accountId?.value}","owner":"features:manage-tokens","group":"portfolio","total":18,"refs":[["app",5],["features:wallet",5],["features:account",4],["features:home",2],["features:wallet-settings",2]]},"Markets":{"path":"/markets","owner":"features:markets","group":"markets","total":5,"refs":[["features:feed",4],["app",1]]},"MarketsTokenDetails":{"path":"/markets_token_details/${token.id}/$shouldShowPortfolio","owner":"features:markets","group":"markets","total":7,"refs":[["features:markets",2],["features:feed",2],["features:wallet",2],["app",1]]},"NFT":{"path":"/nft/${userWalletId.stringValue}","owner":"features:nft","group":"wallet","total":2,"refs":[["app",1],["features:wallet",1]]},"NFTSend":{"path":"/send/nft/${userWalletId.stringValue}/$nftCollectionName/${nftAsset.id}","owner":"features:nft","group":"wallet","total":2,"refs":[["app",1],["features:nft",1]]},"News":{"path":"/news","owner":"features:feed","group":"markets","total":6,"refs":[["features:feed",5],["app",1]]},"NewsDetails":{"path":"/news_details/$newsId","owner":"features:feed","group":"markets","total":5,"refs":[["features:feed",4],["app",1]]},"Onboarding":{"path":"/onboarding_v2/$mode","owner":"features:onboarding-v2","group":"onboarding","total":38,"refs":[["app",21],["features:create-wallet-start",4],["features:details",4],["features:wallet",3],["features:wallet-settings",2],["features:welcome",2],["features:hot-wallet",2]]},"Onramp":{"path":"/onramp/${userWalletId.stringValue}/${currency.symbol}","owner":"features:onramp","group":"tokenaction","total":9,"refs":[["features:tokendetails",3],["features:onramp",3],["app",1],["features:wallet",1],["common:ui-markets",1]]},"OnrampSuccess":{"path":"/onramp/success/$txId","owner":"features:onramp","group":"tokenaction","total":4,"refs":[["features:onramp",3],["app",1]]},"PushNotification":{"path":"/push_notification","owner":"features:push-notifications","group":"wallet","total":18,"refs":[["features:push-notifications",8],["app",4],["features:disclaimer",2],["features:hot-wallet",2],["features:onboarding-v2",1],["features:wallet",1]]},"PushNotificationSettings":{"path":"/push_notification_settings/${userWalletId.stringValue}","owner":"features:push-notification-settings","group":"wallet","total":2,"refs":[["app",1],["features:wallet-settings",1]]},"QrScanning":{"path":"/$source/qr_scanning${source.path}","owner":"features:qr-scanning","group":"misc","total":11,"refs":[["app",5],["features:walletconnect",2],["features:wallet",2],["features:send",2]]},"ReferralProgram":{"path":"/referral_program","owner":"features:referral","group":"settings","total":3,"refs":[["app",1],["features:referral",1],["features:wallet-settings",1]]},"ResetToFactory":{"path":"/reset_to_factory","owner":"features:details","group":"settings","total":2,"refs":[["app",2]]},"SellCrypto":{"path":"/sell_crypto/${userWalletId.stringValue}","owner":"features:onramp","group":"tokenaction","total":3,"refs":[["app",1],["features:onramp",1],["features:wallet",1]]},"Send":{"path":"/send/${userWalletId.stringValue}/${currency.id.value}?","owner":"features:send","group":"tokenaction","total":12,"refs":[["features:wallet",7],["app",4],["features:send",1]]},"SendEntryPoint":{"path":"/send_entry_point/${userWalletId.stringValue}/${currency.id.value}?","owner":"features:send","group":"tokenaction","total":5,"refs":[["features:tokendetails",2],["common:ui-markets",2],["app",1]]},"Staking":{"path":"/staking/${userWalletId.stringValue}/${cryptoCurrency.id.value}/${integrationId.value}","owner":"features:staking","group":"tokenaction","total":5,"refs":[["app",1],["features:tokendetails",1],["features:staking",1],["features:wallet",1],["common:ui-markets",1]]},"Stories":{"path":"/stories$storyId","owner":"features:stories","group":"wallet","total":7,"refs":[["app",2],["features:yield-supply",2],["features:swap",1],["features:walletconnect",1],["features:wallet",1]]},"Survey":{"path":"/survey","owner":"features:survey","group":"misc","total":4,"refs":[["features:survey",3],["app",1]]},"Swap":{"path":"/swap","owner":"features:swap","group":"tokenaction","total":38,"refs":[["common:ui-markets",14],["features:tangempay",9],["features:tokendetails",6],["app",4],["features:manage-tokens",2],["features:wallet",2],["features:onramp",1]]},"TangemPayDetails":{"path":"/tangem_pay_details/${status.account}","owner":"features:tangempay","group":"tangempay","total":3,"refs":[["app",1],["features:wallet",1],["features:tangempay",1]]},"TangemPayHotWalletOnboarding":{"path":"/tangem_pay_hot_wallet_onboarding","owner":"features:tangempay","group":"tangempay","total":2,"refs":[["app",2]]},"TangemPayOnboarding":{"path":"/tangem_pay_onboarding/$mode","owner":"features:tangempay","group":"tangempay","total":20,"refs":[["app",6],["features:wallet",6],["features:details",4],["features:tangempay",4]]},"UpdateAccessCode":{"path":"/update_access_code/${userWalletId.stringValue}","owner":"features:onboarding-v2","group":"onboarding","total":4,"refs":[["features:wallet-settings",2],["app",1],["features:tangempay",1]]},"UpgradeWallet":{"path":"/upgrade_wallet/${userWalletId.stringValue}","owner":"features:hot-wallet","group":"onboarding","total":4,"refs":[["features:hot-wallet",3],["app",1]]},"Usedesk":{"path":"/usedesk/${walletMetaInfo.userWalletId}","owner":"features:usedesk","group":"misc","total":3,"refs":[["features:details",2],["app",1]]},"ViewPhrase":{"path":"/view_seed_phrase/${userWalletId.stringValue}","owner":"features:onboarding-v2","group":"onboarding","total":5,"refs":[["features:hot-wallet",3],["app",1],["features:wallet-settings",1]]},"Wallet":{"path":"/wallet","owner":"features:wallet","group":"wallet","total":58,"refs":[["app",23],["features:welcome",7],["features:onboarding-v2",7],["features:tangempay",5],["features:create-wallet-start",4],["features:hot-wallet",4],["features:home",2],["features:tokendetails",2],["features:details",2],["features:wallet",2]]},"WalletActivation":{"path":"/wallet_activation/${userWalletId.stringValue}","owner":"features:tangempay","group":"onboarding","total":3,"refs":[["features:hot-wallet",2],["app",1]]},"WalletBackup":{"path":"/wallet_backup/${userWalletId.stringValue}/$isColdWalletOptionShown","owner":"features:onboarding-v2","group":"onboarding","total":3,"refs":[["app",1],["features:wallet-settings",1],["features:wallet",1]]},"WalletConnectSessions":{"path":"/wallet_connect_sessions","owner":"features:walletconnect","group":"settings","total":5,"refs":[["features:details",4],["app",1]]},"WalletHardwareBackup":{"path":"/wallet_hardware_backup/${userWalletId.stringValue}","owner":"features:onboarding-v2","group":"onboarding","total":4,"refs":[["features:hot-wallet",2],["app",1],["features:wallet-settings",1]]},"WalletSettings":{"path":"/wallet_settings/${userWalletId.stringValue}","owner":"features:wallet-settings","group":"settings","total":4,"refs":[["features:details",2],["app",1],["features:hot-wallet",1]]},"Welcome":{"path":"/welcome","owner":"features:welcome","group":"entry","total":7,"refs":[["app",6],["features:walletconnect",1]]},"YieldSupplyEntry":{"path":"/yield_supply_entry/${userWalletId.stringValue}/${cryptoCurrency.symbol}","owner":"features:yield-supply","group":"tokenaction","total":7,"refs":[["features:yield-supply",2],["features:feed",2],["app",1],["features:wallet",1],["common:ui-markets",1]]}} +``` + + + \ No newline at end of file diff --git a/.claude/rules/codestyle/design-system.md b/.claude/rules/codestyle/design-system.md index 99b4534e6b..5872714e4f 100644 --- a/.claude/rules/codestyle/design-system.md +++ b/.claude/rules/codestyle/design-system.md @@ -19,10 +19,12 @@ generation a component belongs to is essential so you don't mix tokens or pull t |---|---|---|---|---|---| | **DS1** (legacy) | `core/ui/src/main/java/com/tangem/core/ui/components/` | `TangemTheme.colors` | `TangemTheme.typography` | `TangemTheme.dimens` | `TangemThemePreview` | | **DS2** (redesign) | `core/ui/src/main/java/com/tangem/core/ui/ds/` | `TangemTheme.colors2` | `TangemTheme.typography2` | `TangemTheme.dimens2` | `TangemThemePreviewRedesign` | -| **DS3** (target) | `core/ui/src/main/java/com/tangem/core/ui/ds2/` | `TangemTheme.colors3` | `TangemTheme.typography3` | `TangemTheme.dimens2` | `TangemThemePreviewRedesign` | +| **DS3** (target) | `core/ui/src/main/java/com/tangem/core/ui/ds2/` | `TangemTheme.colors3` | `TangemTheme.typography3` | literal `.dp` (no token) | `TangemThemePreviewRedesign` | > Mind the numbering mismatch: **folder `ds` is DS2**, **folder `ds2` is DS3**. > The `colors2` / `typography2` tokens are `@Deprecated` (ReplaceWith `colors3` / `typography3`). +> **DS3 has no dimension token** — `dimens2` is a DS2 token and must **not** be used in `ds2/` +> components. Express dimensions as literal `.dp` values (see rule 2 below). - **DS1** — the entire current app is built on it. Do **not** add new components here. - **DS2** — redesign components. A transitional generation; don't write new components in it, only @@ -49,9 +51,11 @@ Pattern rules: 1. **Package & location.** `com.tangem.core.ui.ds2.`, folder `core/ui/.../ds2//`. The component name is `Tangem`. -2. **DS3 tokens only.** Colors — `TangemTheme.colors3.*`, text — `TangemTheme.typography3.*`, - dimensions — `TangemTheme.dimens2.*`. No `colors` / `colors2` / hardcoded values (literal dp/colors - are acceptable only inside `@Preview`, where you add `@Suppress("MagicNumber")`). +2. **DS3 tokens only.** Colors — `TangemTheme.colors3.*`, text — `TangemTheme.typography3.*`. No + `colors` / `colors2` and no hardcoded colors outside `@Preview`. **Dimensions have no DS3 token** — + do **not** use `TangemTheme.dimens2.*` (it is a DS2 token); express dimensions as literal `.dp` + values and add `@Suppress("MagicNumber")` to the composable (or a `…Ext.kt` / `…Internal.kt` token + holder, as `TangemButtonInternal.kt` and `TangemCheckmark.kt` do). 3. **Signature.** `modifier: Modifier = Modifier` is mandatory (defaulting to `Modifier`, placed first among the optional params or right after the required ones). Express variants/sizes via a nested `enum` in `object Tangem` (like `TangemButton.Variant` / `TangemButton.Size`), not boolean flags. @@ -156,7 +160,8 @@ Page layout guidelines live in - [ ] Component created under `core/ui/.../ds2//`, package `com.tangem.core.ui.ds2.`. - [ ] Named `Tangem`; first optional parameter is `modifier: Modifier = Modifier`. -- [ ] Uses **only** DS3 tokens: `colors3`, `typography3`, `dimens2`. No hardcoded values outside previews. +- [ ] Uses **only** DS3 tokens: `colors3`, `typography3`. No hardcoded colors outside previews. Dimensions + are literal `.dp` (DS3 has no dimension token — never use `dimens2`), with `@Suppress("MagicNumber")`. - [ ] Variants/sizes expressed as an `enum` inside `object Tangem` (not a set of boolean flags). - [ ] All public types (enums, statuses, constants) declared inside the `object Tangem`. - [ ] Convenient overloads provided (simpler `@Composable` overloads and/or `object` extension presets). diff --git a/.claude/skills/navigation-graph/SKILL.md b/.claude/skills/navigation-graph/SKILL.md new file mode 100644 index 0000000000..c22e57cfd6 --- /dev/null +++ b/.claude/skills/navigation-graph/SKILL.md @@ -0,0 +1,59 @@ +--- +name: navigation-graph +description: Refresh the app's navigation/dependency graph from live code and rebuild the interactive visualization. Scans features/domain Gradle project dependencies and every AppRoute usage, updates the generated regions of .claude/docs/navigation-graph.md (preserving hand-written prose and the curated config), then renders .claude/docs/module-connectivity.html (Area / Module / Screens views with team overlays). Use when the user asks to update/regenerate/refresh the navigation graph, screen map, module connectivity diagram or module-connectivity.html, after adding/removing AppRoute screens or feature/domain modules, or to add/recolor a team. Triggers: "update the navigation graph", "regenerate module-connectivity.html", "refresh the screen map", "rebuild the module connectivity diagram", "add a team to the graph". +allowed-tools: Bash, Read, Edit, Grep, Glob +--- + +Refresh and rebuild the app's connectivity visualization. The data flows **code → doc → HTML**: + +``` +features/domain/data build.gradle.kts deps ─┐ +AppRoute.kt + every AppRoute.X usage ─┴─▶ build_graph.py ─▶ .claude/docs/navigation-graph.md + │ (data + curated config blocks) + ▼ + render_html.py ─▶ .claude/docs/module-connectivity.html +``` + +`navigation-graph.md` is the source of truth. Its hand-written prose (sections 1–4: route tables, edges-with-triggers, nested routes, deep links) is **owned by humans and never overwritten**. The skill manages only the region between `` and ``, which holds: +- an **editable CONFIG json block** — functional groups (label/color/grid anchor), per-screen group + owner, and teams. Preserved across refreshes (human edits win). +- **auto data blocks** — `areaGraph`, `moduleGraph`, `screensGraph`, `screensMeta`. Overwritten from code every run. + +## To refresh after a code change (the common case) + +Run both scripts from anywhere in the repo (they locate the root via `settings.gradle.kts`). The scan walks the whole tree — expect ~10–20s. + +```bash +python3 .claude/skills/navigation-graph/scripts/build_graph.py +python3 .claude/skills/navigation-graph/scripts/render_html.py +``` + +Then report to the user: the printed counts, **any `⚠ NEW screen` warnings**, and that `.claude/docs/module-connectivity.html` is a self-contained file they can open in a browser. + +**If `build_graph.py` prints `⚠ NEW screen …` warnings:** a route was added to `AppRoute.kt` but isn't classified. The new screen was defaulted to group `misc` / owner `app`. Edit the CONFIG block in `.claude/docs/navigation-graph.md` to set its real `screenGroups[Name]` and `screenOwners[Name]`, then re-run both scripts. Pick the group/owner by reading where the route lives and is pushed from. Removed routes are reported as "no longer in code" and are harmless (kept in config for when they return). + +## To change grouping, owners, colors, or teams + +Edit the **CONFIG** json block inside `.claude/docs/navigation-graph.md` (between `` and `:END`), then run `render_html.py` (no need to re-scan code unless code changed): +- **`groups`** — add/rename a functional group or change its `color` / `label` / grid `anchor` (`x`,`y` are 0–1 fractions of the canvas). +- **`screenGroups` / `screenOwners`** — reassign a screen. +- **`teams`** — add a team object `{ "id", "name", "color", "roots": [...module path prefixes...], "screens": [...AppRoute names...] }`. `roots` drive the overlay in Area/Module views (e.g. `"features:onramp"`, `"domain:staking"`, `"data:swap"`); `screens` drive it in the Screens view (e.g. `"Send"`). A module/screen may be matched by either. The overlay (hull + rings, optional cluster force) and per-view member counts wire up automatically. + +After editing CONFIG, re-run `render_html.py`. If you changed code-derived facts, run `build_graph.py` first. + +## What gets extracted (and what's inferred) + +- **Dependency edges** (Area/Module): only project (`projects.*`) deps among `features/*`, `domain/*` and `data/*` — external libraries excluded. Area view merges each area's `api`/`impl`/`models`. The Data-layer toggle in the HTML appears only when data modules are present. +- **Screen edges** (Screens): the **target** is exact — the `AppRoute.X` argument of a `push`/`replaceCurrent`/`replaceAll`/`popTo` call. The **source** is the navigating file's feature module collapsed to that feature's main screen (eponymous screen if one exists, else most-referenced), so intra-feature hops are merged. Calls from shared UI / app root attach to a synthetic **App shell** node. Group/owner come from the curated CONFIG. + +## Files + +``` +.claude/skills/navigation-graph/ + SKILL.md + assets/template.html # parameterized HTML (8 inject points: 4 data blocks + teams + group colors/labels/anchors) + assets/config.seed.json # initial curation; used only when the doc has no CONFIG block yet + scripts/build_graph.py # code -> navigation-graph.md (managed region) + scripts/render_html.py # navigation-graph.md -> module-connectivity.html +``` + +Outputs live in `.claude/docs/`. The scripts are idempotent — re-running never duplicates the managed region. Do not hand-edit the auto data blocks (they're regenerated); edit CONFIG instead. After regenerating, sanity-check the HTML by extracting its ` diff --git a/.claude/skills/navigation-graph/scripts/build_graph.py b/.claude/skills/navigation-graph/scripts/build_graph.py new file mode 100644 index 0000000000..ff1a94c5a3 --- /dev/null +++ b/.claude/skills/navigation-graph/scripts/build_graph.py @@ -0,0 +1,277 @@ +#!/usr/bin/env python3 +""" +build_graph.py — scan the live codebase and refresh the managed regions of +.claude/docs/navigation-graph.md (the source of truth for module-connectivity.html). + +What it extracts from code: + - features/domain/data Gradle project dependencies -> area graph + module graph + - AppRoute screens + every `AppRoute.X` reference -> screen navigation graph + +What it preserves: + - all hand-written prose ABOVE the marker + - the curated CONFIG block (groups / owners / teams) inside the managed region + +Run from anywhere inside the repo: python3 build_graph.py +Then render the HTML: python3 render_html.py +""" +import os, re, json, sys +from collections import defaultdict + +# ---------------------------------------------------------------- paths +def find_root(start): + d = os.path.abspath(start) + while d != os.path.dirname(d): + if os.path.exists(os.path.join(d, "settings.gradle.kts")): + return d + d = os.path.dirname(d) + sys.exit("ERROR: could not locate repo root (settings.gradle.kts not found).") + +SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__)) +ROOT = find_root(os.getcwd()) +SKILL = os.path.dirname(SCRIPT_DIR) +DOCS = os.path.join(ROOT, ".claude", "docs") +MD = os.path.join(DOCS, "navigation-graph.md") +SEED = os.path.join(SKILL, "assets", "config.seed.json") +APPROUTE = os.path.join(ROOT, "common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt") + +# ---------------------------------------------------------------- managed-region helpers +BEGIN = "" +END = "" + +def block(text, key): + """Return the JSON string inside the markers, or None.""" + m = re.search(r"\s*```json\s*(.*?)\s*```\s*" + % (re.escape(key), re.escape(key)), text, re.S) + return m.group(1) if m else None + +def wrap(key, payload): + return f"\n```json\n{payload}\n```\n" + +# ---------------------------------------------------------------- gradle dependency scan +def camel_to_kebab(s): return re.sub(r'(? 1 and p[0] in SCOPED_LAYERS else None + +def build_area_graph(modules, edges): + agg = defaultdict(lambda: {"w": 0, "api": False}) + for s, d, c in edges: + if not (is_scoped(s) and is_scoped(d)): continue + sa, da = area_of(s), area_of(d) + if not sa or not da or sa == da: continue + agg[(sa, da)]["w"] += 1 + if c == 'api': agg[(sa, da)]["api"] = True + indeg, outdeg = defaultdict(int), defaultdict(int) + for (s, d) in agg: outdeg[s] += 1; indeg[d] += 1 + nodes = sorted({n for e in agg for n in e}) + N = [[n, n.split(':')[1], n.split(':')[0], indeg[n], outdeg[n]] for n in nodes] + E = [[s, d, v["w"], 1 if v["api"] else 0] for (s, d), v in agg.items()] + return {"n": N, "e": E} + +def build_module_graph(modules, edges): + agg = defaultdict(lambda: {"w": 0, "api": False}) + for s, d, c in edges: + if not (is_scoped(s) and is_scoped(d)) or s == d: continue + agg[(s, d)]["w"] += 1 + if c == 'api': agg[(s, d)]["api"] = True + indeg, outdeg = defaultdict(int), defaultdict(int) + for (s, d) in agg: outdeg[s] += 1; indeg[d] += 1 + conn = {n for e in agg for n in e} + N = [[m, ':'.join(m.split(':')[2:]), m.split(':')[1], indeg[m], outdeg[m]] + for m in sorted(conn)] + E = [[s, d, v["w"], 1 if v["api"] else 0] for (s, d), v in agg.items()] + return {"n": N, "e": E} + +# ---------------------------------------------------------------- AppRoute scan +REF_RE = re.compile(r'AppRoute\.([A-Z][A-Za-z0-9]+)') +DECL_RE = re.compile(r'^ (?:data )?(?:object|class) (\w+)', re.M) + +def read_kotlin_string(text, i): + """text[i] must be '"'. Return (content, index_after_closing_quote), handling \\" + escapes and ${...} template expressions (nested braces/strings copied verbatim) so a + path with string templates isn't truncated at the first inner quote.""" + out, j = [], i + 1 + while j < len(text): + c = text[j] + if c == '\\': + out.append(text[j:j + 2]); j += 2; continue + if c == '"': + return ''.join(out), j + 1 + if c == '$' and j + 1 < len(text) and text[j + 1] == '{': + out.append('${'); j += 2; depth = 1 + while j < len(text) and depth > 0: + ck = text[j] + if ck == '"': + s, j = read_kotlin_string(text, j); out.append('"' + s + '"'); continue + if ck == '{': depth += 1 + elif ck == '}': depth -= 1 + if depth > 0: out.append(ck) + j += 1 + out.append('}'); continue + out.append(c); j += 1 + return ''.join(out), j + +def extract_path(block): + """First string literal of the `path = …` argument within one screen's source block. + Block-scoped (so multi-line `AppRoute(` blocks resolve) and template-aware (so paths + aren't truncated); for a non-literal RHS (e.g. `path = when {…}`) it takes the first + branch literal. Returns None when the block has no `path =`.""" + m = re.search(r'\bpath\s*=\s*', block) + if not m: return None + i = m.end() + while i < len(block) and block[i] in ' \t\r\n': i += 1 + if i < len(block) and block[i] == '"': + return read_kotlin_string(block, i)[0] + q = block.find('"', i) + return read_kotlin_string(block, q)[0] if q != -1 else None + +def scan_routes(): + src = open(APPROUTE, encoding='utf-8').read() + decls = [(m.group(1), m.start()) for m in DECL_RE.finditer(src)] + screens = {name for name, _ in decls} + paths = {} + for idx, (name, start) in enumerate(decls): + end = decls[idx + 1][1] if idx + 1 < len(decls) else len(src) + p = extract_path(src[start:end]) + if p is not None: paths.setdefault(name, p) + usage = defaultdict(lambda: defaultdict(int)) + nav = defaultdict(int) + def area(fp): + parts = os.path.relpath(fp, ROOT).split(os.sep) + top = parts[0] + return f"{top}:{parts[1]}" if top in ('features','domain','data','core','common','libs') and len(parts) > 1 else top + for dp, _, fns in os.walk(ROOT): + if '/build/' in dp or '/.git' in dp or '/.gradle' in dp: continue + for fn in fns: + if not fn.endswith('.kt'): continue + fp = os.path.join(dp, fn) + if os.path.samefile(fp, APPROUTE) if os.path.exists(APPROUTE) else False: continue + try: txt = open(fp, encoding='utf-8', errors='ignore').read() + except Exception: continue + if 'AppRoute.' not in txt: continue + a = area(fp) + for m in REF_RE.finditer(txt): + if m.group(1) in screens: usage[m.group(1)][a] += 1 + for nm in re.finditer(r'\b(push|replaceCurrent|replaceAll|popTo)\s*\(', txt): + r2 = REF_RE.search(txt[nm.end():nm.end()+160]) + if r2 and r2.group(1) in screens: nav[(a, r2.group(1))] += 1 + return screens, paths, usage, nav + +def build_screen_graph(screens, paths, usage, nav, cfg): + total = {s: sum(usage[s].values()) for s in screens} + sg, so = cfg["screenGroups"], cfg["screenOwners"] + owned = defaultdict(list) + for s in sorted(screens): owned[so.get(s, cfg["defaultOwner"])].append(s) + def fnorm(a): return a.split(':')[-1].replace('-', '').lower() + def main_of(a, ss): + epon = [s for s in ss if s.lower() == fnorm(a)] + return epon[0] if epon else max(ss, key=lambda x: (total[x], x)) # deterministic tie-break + main = {a: main_of(a, ss) for a, ss in owned.items()} + APPSHELL = 'AppShell' + edge = defaultdict(int) + for (a, t), c in nav.items(): + src = main.get(a, APPSHELL) + if src == t: continue + edge[(src, t)] += c + use_shell = any(s == APPSHELL for s, _ in edge) + indeg, outdeg = defaultdict(int), defaultdict(int) + for (s, t) in edge: outdeg[s] += 1; indeg[t] += 1 + N = [[s, s, sg.get(s, cfg["defaultGroup"]), indeg[s], outdeg[s]] for s in sorted(screens)] + if use_shell: N.append([APPSHELL, 'App shell', 'shell', indeg[APPSHELL], outdeg[APPSHELL]]) + E = [[s, t, w, 0] for (s, t), w in edge.items()] + meta = {} + for s in sorted(screens): + meta[s] = {"path": paths.get(s, ""), "owner": so.get(s, cfg["defaultOwner"]), + "group": sg.get(s, cfg["defaultGroup"]), "total": total[s], + "refs": sorted(usage[s].items(), key=lambda kv: -kv[1])} + return {"n": N, "e": E}, meta + +# ---------------------------------------------------------------- main +def main(): + if not os.path.exists(APPROUTE): + sys.exit(f"ERROR: AppRoute.kt not found at {APPROUTE}") + old = open(MD, encoding='utf-8').read() if os.path.exists(MD) else "" + + # config: prefer the one already in the doc (human edits win), else seed + cfg_str = block(old, "config") + cfg = json.loads(cfg_str) if cfg_str else json.load(open(SEED)) + + modules, dep_edges = scan_modules() + area_g = build_area_graph(modules, dep_edges) + mod_g = build_module_graph(modules, dep_edges) + screens, paths, usage, nav = scan_routes() + + # reconcile config with the screens actually present in code + warns = [] + for s in sorted(screens): + if s not in cfg["screenGroups"]: + cfg["screenGroups"][s] = cfg["defaultGroup"]; warns.append(f"NEW screen '{s}': group defaulted to '{cfg['defaultGroup']}' — set it in CONFIG") + if s not in cfg["screenOwners"]: + cfg["screenOwners"][s] = cfg["defaultOwner"]; warns.append(f"NEW screen '{s}': owner defaulted to '{cfg['defaultOwner']}' — set it in CONFIG") + stale = [s for s in cfg["screenGroups"] if s not in screens] + + screen_g, screen_meta = build_screen_graph(screens, paths, usage, nav, cfg) + + inv_area = sum(1 for s, t, w, a in area_g["e"] if t.startswith('features:') and not s.startswith('features:')) + + cj = lambda o: json.dumps(o, separators=(',', ':')) + summary = ( + f"_Auto-generated from code by the `navigation-graph` skill. Edit only the CONFIG block below._\n\n" + f"- **Screens (AppRoute):** {len(screens)} · screen-nav edges {len(screen_g['e'])}\n" + f"- **Area graph:** {len(area_g['n'])} feature/domain/data areas · {len(area_g['e'])} dependency edges · {inv_area} inverted (domain/data→features)\n" + f"- **Module graph:** {len(mod_g['n'])} modules · {len(mod_g['e'])} edges\n" + ) + if warns: summary += "\n**Action needed:**\n" + "\n".join(f"- {w}" for w in warns) + "\n" + if stale: summary += f"\n_Config has {len(stale)} screen(s) no longer in code (kept, harmless): {', '.join(stale)}_\n" + + managed = "\n\n".join([ + BEGIN, + "## Connectivity data (generated)\n\n" + summary, + "### Curated config (editable — preserved across refreshes)\n\n" + wrap("config", json.dumps(cfg, indent=2)), + "### Graph data (auto — overwritten every refresh; do not hand-edit)\n\n" + + wrap("areaGraph", cj(area_g)) + "\n\n" + wrap("moduleGraph", cj(mod_g)) + "\n\n" + + wrap("screensGraph", cj(screen_g)) + "\n\n" + wrap("screensMeta", cj(screen_meta)), + END, + ]) + + if BEGIN in old and END in old: + head = old[:old.index(BEGIN)].rstrip() + "\n\n" + tail = old[old.index(END) + len(END):] + new = head + managed + tail + elif old.strip(): + new = old.rstrip() + "\n\n" + managed + "\n" + else: + new = "# Navigation Graph\n\n" + managed + "\n" + + os.makedirs(DOCS, exist_ok=True) + open(MD, "w", encoding='utf-8').write(new) + print(f"✓ updated {os.path.relpath(MD, ROOT)}") + print(f" screens={len(screens)} screen-edges={len(screen_g['e'])} | " + f"areas={len(area_g['n'])}/{len(area_g['e'])} | modules={len(mod_g['n'])}/{len(mod_g['e'])}") + for w in warns: print(" ⚠ " + w) + print("Next: python3 " + os.path.join(SCRIPT_DIR, "render_html.py")) + +if __name__ == "__main__": + main() \ No newline at end of file diff --git a/.claude/skills/navigation-graph/scripts/render_html.py b/.claude/skills/navigation-graph/scripts/render_html.py new file mode 100644 index 0000000000..baeab3d348 --- /dev/null +++ b/.claude/skills/navigation-graph/scripts/render_html.py @@ -0,0 +1,73 @@ +#!/usr/bin/env python3 +""" +render_html.py — build .claude/docs/module-connectivity.html from the data blocks +in .claude/docs/navigation-graph.md (which build_graph.py refreshes from code). + +Run AFTER build_graph.py: python3 render_html.py +""" +import os, re, json, sys + +def find_root(start): + d = os.path.abspath(start) + while d != os.path.dirname(d): + if os.path.exists(os.path.join(d, "settings.gradle.kts")): + return d + d = os.path.dirname(d) + sys.exit("ERROR: could not locate repo root (settings.gradle.kts not found).") + +SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__)) +ROOT = find_root(os.getcwd()) +SKILL = os.path.dirname(SCRIPT_DIR) +MD = os.path.join(ROOT, ".claude", "docs", "navigation-graph.md") +TEMPLATE = os.path.join(SKILL, "assets", "template.html") +OUT = os.path.join(ROOT, ".claude", "docs", "module-connectivity.html") + +def block(text, key): + m = re.search(r"\s*```json\s*(.*?)\s*```\s*" + % (re.escape(key), re.escape(key)), text, re.S) + if not m: + sys.exit(f"ERROR: data block '{key}' not found in {MD}. Run build_graph.py first.") + return json.loads(m.group(1)) + +def main(): + if not os.path.exists(MD): sys.exit(f"ERROR: {MD} not found. Run build_graph.py first.") + if not os.path.exists(TEMPLATE): sys.exit(f"ERROR: template missing at {TEMPLATE}") + text = open(MD, encoding='utf-8').read() + cfg = block(text, "config") + area = block(text, "areaGraph") + mod = block(text, "moduleGraph") + screens = block(text, "screensGraph") + smeta = block(text, "screensMeta") + + groups = cfg["groups"] + group_colors = {g: groups[g]["color"] for g in groups} + group_labels = {g: groups[g]["label"] for g in groups} + group_anchors = {g: groups[g]["anchor"] for g in groups} + + cj = lambda o: json.dumps(o, separators=(',', ':')) + tpl = open(TEMPLATE, encoding='utf-8').read() + repl = { + "/*__AREA_DATA__*/null": cj(area), + "/*__MODULE_DATA__*/null": cj(mod), + "/*__SCREENS_DATA__*/null": cj(screens), + "/*__SCREENS_META__*/null": cj(smeta), + "/*__TEAMS__*/[]": cj(cfg["teams"]), + "/*__GROUP_COLORS__*/{}": cj(group_colors), + "/*__GROUP_LABELS__*/{}": cj(group_labels), + "/*__GROUP_ANCHORS__*/{}": cj(group_anchors), + } + out = tpl + for k, v in repl.items(): + if k not in out: sys.exit(f"ERROR: placeholder '{k}' missing in template — template/skill version mismatch.") + out = out.replace(k, v) + for ph in ("__AREA_DATA__", "__MODULE_DATA__", "__SCREENS_DATA__", "__SCREENS_META__", + "__TEAMS__", "__GROUP_COLORS__", "__GROUP_LABELS__", "__GROUP_ANCHORS__"): + if "/*" + ph + "*/" in out: sys.exit(f"ERROR: placeholder {ph} left unreplaced.") + open(OUT, "w", encoding='utf-8').write(out) + print(f"✓ wrote {os.path.relpath(OUT, ROOT)} ({len(out)//1024} KB, self-contained)") + print(f" area {len(area['n'])}n/{len(area['e'])}e · module {len(mod['n'])}n/{len(mod['e'])}e · " + f"screens {len(screens['n'])}n/{len(screens['e'])}e · teams {len(cfg['teams'])}") + print(f" open: {OUT}") + +if __name__ == "__main__": + main() \ No newline at end of file diff --git a/CLAUDE.md b/CLAUDE.md index d093519ee6..0dc488bd3f 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -102,7 +102,7 @@ The app uses [Decompose](https://github.com/arkivanov/Decompose) for lifecycle-a - **Async:** Kotlin Coroutines + Flow. Inject `CoroutineDispatcherProvider` (from `core/utils`) instead of using `Dispatchers.*` directly — provides `main`, `mainImmediate`, `io`, `default`, `single` - **Error handling:** Arrow's `Either` pattern throughout domain/data layers. `DataError` sealed hierarchy for domain errors. See `domain/core/CLAUDE.md` for the LCE pattern - **Analytics:** `AnalyticsEvent(category, event, params)` in `core/analytics/models/`. Feature events are sealed class hierarchies extending `AnalyticsEvent`. Send via injected `AnalyticsEventHandler` -- **Feature toggles:** `FeatureTogglesManager` in `core/config-toggles/`. Toggles are defined in `core/config-toggles/src/main/assets/configs/feature_toggles_config.json` and auto-generated into a `FeatureToggles` enum by the convention plugin at build time. Each feature module exposes its own `XxxFeatureToggles` interface (in `api/`) with a `DefaultXxxFeatureToggles` implementation (in `impl/`) that delegates to `FeatureTogglesManager` +- **Feature toggles:** `FeatureTogglesManager` in `core/config-toggles/`. See `core/config-toggles/CLAUDE.md`. - **Supported languages:** `SupportedLanguages` in `core/utils/` defines the app's supported locales: en, ru, de, fr, it, ja, uk, zh, es. `getCurrentSupportedLanguageCode()` returns the device locale if supported, otherwise falls back to English. Used by API calls that accept a language parameter ### Build System diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c307bb3f9b..33ba9e4946 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -191,6 +191,7 @@ dependencies { implementation(projects.libs.tangemSdkApi) implementation(projects.data.account) + implementation(projects.data.addressBook) implementation(projects.data.appCurrency) implementation(projects.data.appTheme) implementation(projects.data.balanceHiding) diff --git a/app/src/main/java/com/tangem/tap/di/domain/AddressBookDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/AddressBookDomainModule.kt index 3fa8efefb9..d16d61ed8a 100644 --- a/app/src/main/java/com/tangem/tap/di/domain/AddressBookDomainModule.kt +++ b/app/src/main/java/com/tangem/tap/di/domain/AddressBookDomainModule.kt @@ -1,11 +1,18 @@ package com.tangem.tap.di.domain import com.tangem.domain.addressbook.crypto.AddressBookCipher +import com.tangem.domain.addressbook.interactor.GetVerifiedContactsInteractor +import com.tangem.domain.addressbook.interactor.SaveContactInteractor +import com.tangem.domain.addressbook.repository.AddressBookRepository import com.tangem.domain.addressbook.time.DefaultIsoTimestampProvider import com.tangem.domain.addressbook.time.IsoTimestampProvider +import com.tangem.domain.addressbook.usecase.DeleteContactUseCase +import com.tangem.domain.addressbook.usecase.GetContactsUseCase import com.tangem.domain.addressbook.usecase.ValidateContactAddressUseCase -import com.tangem.domain.addressbook.usecase.VerifyAddressEntriesUseCase +import com.tangem.domain.addressbook.usecase.ValidateContactNameUseCase +import com.tangem.domain.common.wallets.UserWalletsListRepository import com.tangem.domain.tokens.GetNetworkAddressesUseCase +import com.tangem.domain.transaction.usecase.SignUseCase import com.tangem.domain.transaction.usecase.ValidateWalletAddressUseCase import com.tangem.domain.transaction.usecase.VerifySecp256k1MessagesUseCase import dagger.Module @@ -32,10 +39,50 @@ object AddressBookDomainModule { @Provides @Singleton - fun provideVerifyAddressEntriesUseCase( + fun provideValidateContactNameUseCase(repository: AddressBookRepository): ValidateContactNameUseCase { + return ValidateContactNameUseCase(repository = repository) + } + + @Provides + @Singleton + fun provideGetContactsUseCase(repository: AddressBookRepository): GetContactsUseCase { + return GetContactsUseCase(repository = repository) + } + + @Provides + @Singleton + fun provideGetVerifiedContactsInteractor( + getContactsUseCase: GetContactsUseCase, verifyMessagesUseCase: VerifySecp256k1MessagesUseCase, - ): VerifyAddressEntriesUseCase { - return VerifyAddressEntriesUseCase(verifyMessagesUseCase = verifyMessagesUseCase) + userWalletsListRepository: UserWalletsListRepository, + ): GetVerifiedContactsInteractor { + return GetVerifiedContactsInteractor( + getContacts = getContactsUseCase, + verifyMessages = verifyMessagesUseCase, + userWalletsListRepository = userWalletsListRepository, + ) + } + + @Provides + @Singleton + fun provideSaveContactInteractor( + repository: AddressBookRepository, + validateContactNameUseCase: ValidateContactNameUseCase, + signUseCase: SignUseCase, + timestampProvider: IsoTimestampProvider, + ): SaveContactInteractor { + return SaveContactInteractor( + repository = repository, + validateContactName = validateContactNameUseCase, + signUseCase = signUseCase, + timestampProvider = timestampProvider, + ) + } + + @Provides + @Singleton + fun provideDeleteContactUseCase(repository: AddressBookRepository): DeleteContactUseCase { + return DeleteContactUseCase(repository = repository) } @Provides diff --git a/app/src/main/java/com/tangem/tap/di/domain/SwapDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/SwapDomainModule.kt index 1589246e98..6b9e05763c 100644 --- a/app/src/main/java/com/tangem/tap/di/domain/SwapDomainModule.kt +++ b/app/src/main/java/com/tangem/tap/di/domain/SwapDomainModule.kt @@ -4,13 +4,11 @@ import com.tangem.domain.swap.SwapErrorResolver import com.tangem.domain.swap.SwapRepositoryV2 import com.tangem.domain.swap.SwapTransactionRepository import com.tangem.domain.swap.usecase.* -import com.tangem.feature.swap.domain.GetAvailablePairsUseCase import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent import javax.inject.Singleton -import com.tangem.feature.swap.domain.api.SwapRepository as OldSwapRepository /** [REDACTED_AUTHOR] @@ -19,12 +17,6 @@ import com.tangem.feature.swap.domain.api.SwapRepository as OldSwapRepository @InstallIn(SingletonComponent::class) internal object SwapDomainModule { - @Provides - @Singleton - fun provideGetAvailablePairsUseCase(swapRepository: OldSwapRepository): GetAvailablePairsUseCase { - return GetAvailablePairsUseCase(swapRepository = swapRepository) - } - @Provides @Singleton fun provideGetSwapSupportedPairsUseCase( diff --git a/app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt b/app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt index c43ead18f2..4ef8ee038e 100644 --- a/app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt +++ b/app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt @@ -21,7 +21,6 @@ import com.tangem.features.feed.entry.components.FeedEntryRoute import com.tangem.features.home.api.HomeComponent import com.tangem.features.hotwallet.* import com.tangem.features.kyc.KycComponent -import com.tangem.features.survey.SurveyComponent import com.tangem.features.managetokens.component.ChooseManagedTokensComponent import com.tangem.features.managetokens.component.ManageTokensComponent import com.tangem.features.managetokens.component.ManageTokensMode @@ -37,9 +36,10 @@ import com.tangem.features.send.api.NFTSendComponent import com.tangem.features.send.api.SendComponent import com.tangem.features.send.api.SendEntryPointComponent import com.tangem.features.staking.api.StakingComponent +import com.tangem.features.survey.SurveyComponent import com.tangem.features.swap.SwapComponent -import com.tangem.features.tangempay.components.TangemPayHotWalletOnboardingComponent import com.tangem.features.tangempay.components.TangemPayDetailsContainerComponent +import com.tangem.features.tangempay.components.TangemPayHotWalletOnboardingComponent import com.tangem.features.tangempay.components.TangemPayOnboardingComponent import com.tangem.features.tangempay.components.TangemPayOnboardingComponent.Params.* import com.tangem.features.tokendetails.TokenDetailsComponent @@ -71,7 +71,6 @@ internal class ChildFactory @Inject constructor( private val onrampSuccessComponentFactory: OnrampSuccessComponent.Factory, private val buyCryptoComponentFactory: BuyCryptoComponent.Factory, private val sellCryptoComponentFactory: SellCryptoComponent.Factory, - private val swapSelectTokensComponentFactory: SwapSelectTokensComponent.Factory, private val onboardingEntryComponentFactory: OnboardingEntryComponent.Factory, private val newWelcomeComponentFactory: NewWelcomeComponent.Factory, private val storiesComponentFactory: StoriesComponent.Factory, @@ -253,13 +252,6 @@ internal class ChildFactory @Inject constructor( componentFactory = sellCryptoComponentFactory, ) } - is AppRoute.SwapCrypto -> { - createComponentChild( - context = context, - params = SwapSelectTokensComponent.Params(userWalletId = route.userWalletId), - componentFactory = swapSelectTokensComponentFactory, - ) - } is AppRoute.Onboarding -> { createComponentChild( context = context, @@ -759,7 +751,7 @@ internal class ChildFactory @Inject constructor( is AppRoute.AddressBook -> { createComponentChild( context = context, - params = AddressBookComponent.Params(route.predefinedAddress), + params = AddressBookComponent.Params(addressBookOpenMode = route.addressBookOpenMode), componentFactory = addressBookComponentFactory, ) } diff --git a/app/src/test/kotlin/com/tangem/tap/common/pushes/TokenDetailsPushHandlerTest.kt b/app/src/test/kotlin/com/tangem/tap/common/pushes/TokenDetailsPushHandlerTest.kt index 84779067f5..01710b9388 100644 --- a/app/src/test/kotlin/com/tangem/tap/common/pushes/TokenDetailsPushHandlerTest.kt +++ b/app/src/test/kotlin/com/tangem/tap/common/pushes/TokenDetailsPushHandlerTest.kt @@ -14,7 +14,7 @@ import com.tangem.domain.models.wallet.UserWallet import com.tangem.domain.models.wallet.UserWalletId import com.tangem.domain.models.wallet.isLocked import com.tangem.domain.models.wallet.isMultiCurrency -import com.tangem.domain.wallets.models.GetUserWalletError +import com.tangem.domain.wallets.models.errors.GetUserWalletError import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase import com.tangem.domain.wallets.usecase.GetUserWalletUseCase import com.tangem.utils.coroutines.AppCoroutineScope diff --git a/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt b/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt index 3b46824c4d..90449eab97 100644 --- a/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt +++ b/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt @@ -6,6 +6,7 @@ import android.annotation.SuppressLint import android.os.Bundle import com.tangem.common.routing.bundle.RouteBundleParams import com.tangem.common.routing.bundle.bundle +import com.tangem.common.routing.entity.AddressBookOpenMode import com.tangem.common.routing.entity.InitScreenLaunchMode import com.tangem.core.analytics.models.AnalyticsParam import com.tangem.core.decompose.navigation.Route @@ -174,8 +175,15 @@ sealed class AppRoute(val path: String) : Route { @Serializable data class AddressBook( - val predefinedAddress: String? = null, - ) : AppRoute(path = "/address_book/predefinedAddress/$predefinedAddress") + val addressBookOpenMode: AddressBookOpenMode = AddressBookOpenMode.Default, + ) : AppRoute( + path = when (addressBookOpenMode) { + is AddressBookOpenMode.WithContactCreation -> + "/address_book/${addressBookOpenMode.address}-${addressBookOpenMode.networkId}" + is AddressBookOpenMode.ContactSelection -> "/address_book/select/${addressBookOpenMode.networkId}" + AddressBookOpenMode.Default -> "/address_book" + }, + ) @Serializable data class QrScanning(val source: Source) : AppRoute(path = "/$source/qr_scanning${source.path}") { @@ -324,11 +332,6 @@ sealed class AppRoute(val path: String) : Route { val userWalletId: UserWalletId, ) : AppRoute(path = "/sell_crypto/${userWalletId.stringValue}") - @Serializable - data class SwapCrypto( - val userWalletId: UserWalletId, - ) : AppRoute(path = "/swap_crypto/${userWalletId.stringValue}") - /** * Onboarding V2 * @property scanResponse scan response, determines onboarding route by the product type diff --git a/common/routing/src/main/kotlin/com/tangem/common/routing/entity/AddressBookOpenMode.kt b/common/routing/src/main/kotlin/com/tangem/common/routing/entity/AddressBookOpenMode.kt new file mode 100644 index 0000000000..e9af666c27 --- /dev/null +++ b/common/routing/src/main/kotlin/com/tangem/common/routing/entity/AddressBookOpenMode.kt @@ -0,0 +1,26 @@ +package com.tangem.common.routing.entity + +import kotlinx.serialization.Serializable + +/** How the address book is opened — part of the navigation contract, carried by [com.tangem.common.routing.AppRoute.AddressBook]. */ +@Serializable +sealed interface AddressBookOpenMode { + + @Serializable + data object Default : AddressBookOpenMode + + @Serializable + data class WithContactCreation( + val address: String, + val networkId: String, + ) : AddressBookOpenMode + + /** + * Opened from the Send flow to pick a recipient. The list is filtered by [networkId] (the current send network), + * and the chosen contact's address is delivered back via `ContactSelectionTrigger` rather than navigation. + */ + @Serializable + data class ContactSelection( + val networkId: String, + ) : AddressBookOpenMode +} \ No newline at end of file diff --git a/common/ui/src/main/java/com/tangem/common/ui/account/AccountIconUM.kt b/common/ui/src/main/java/com/tangem/common/ui/account/AccountIconUM.kt index caa4e584e5..eccf95d9ec 100644 --- a/common/ui/src/main/java/com/tangem/common/ui/account/AccountIconUM.kt +++ b/common/ui/src/main/java/com/tangem/common/ui/account/AccountIconUM.kt @@ -1,8 +1,10 @@ package com.tangem.common.ui.account +import androidx.compose.runtime.Immutable import com.tangem.domain.models.account.CryptoPortfolioIcon.Color import com.tangem.domain.models.account.CryptoPortfolioIcon.Icon +@Immutable sealed class AccountIconUM { data class CryptoPortfolio(val value: Icon, val color: Color) : AccountIconUM() diff --git a/core/analytics/models/src/main/java/com/tangem/core/analytics/models/event/MainScreenAnalyticsEvent.kt b/core/analytics/models/src/main/java/com/tangem/core/analytics/models/event/MainScreenAnalyticsEvent.kt index b09ed9c19d..5440a2e92f 100644 --- a/core/analytics/models/src/main/java/com/tangem/core/analytics/models/event/MainScreenAnalyticsEvent.kt +++ b/core/analytics/models/src/main/java/com/tangem/core/analytics/models/event/MainScreenAnalyticsEvent.kt @@ -82,8 +82,6 @@ sealed class MainScreenAnalyticsEvent( class BuyScreenOpened : MainScreenAnalyticsEvent(event = "Buy Screen Opened") - class SwapScreenOpened : MainScreenAnalyticsEvent(event = "Swap Screen Opened") - class SellScreenOpened : MainScreenAnalyticsEvent(event = "Sell Screen Opened") data class BuyTokenClicked(val currencySymbol: String) : MainScreenAnalyticsEvent( @@ -96,21 +94,6 @@ sealed class MainScreenAnalyticsEvent( params = mapOf(TOKEN_PARAM to currencySymbol), ) - data class SwapTokenClicked(val currencySymbol: String) : MainScreenAnalyticsEvent( - event = "Swap Token Clicked", - params = mapOf(TOKEN_PARAM to currencySymbol), - ) - - data class ReceiveTokenClicked(val currencySymbol: String) : MainScreenAnalyticsEvent( - event = "Receive Token Clicked", - params = mapOf(TOKEN_PARAM to currencySymbol), - ) - - data class RemoveTokenClicked(val currencySymbol: String) : MainScreenAnalyticsEvent( - event = "Remove Button Clicked", - params = mapOf(TOKEN_PARAM to currencySymbol), - ) - data class ButtonClose(val source: AnalyticsParam.ScreensSources) : MainScreenAnalyticsEvent( event = "Button - Close", params = mapOf(AnalyticsParam.SOURCE to source.value), diff --git a/core/analytics/models/src/main/java/com/tangem/core/analytics/models/event/SwapAnalyticsEvent.kt b/core/analytics/models/src/main/java/com/tangem/core/analytics/models/event/SwapAnalyticsEvent.kt index 74b68afc09..fc1e1e732e 100644 --- a/core/analytics/models/src/main/java/com/tangem/core/analytics/models/event/SwapAnalyticsEvent.kt +++ b/core/analytics/models/src/main/java/com/tangem/core/analytics/models/event/SwapAnalyticsEvent.kt @@ -1,11 +1,7 @@ package com.tangem.core.analytics.models.event import com.tangem.core.analytics.models.AnalyticsEvent -import com.tangem.core.analytics.models.AnalyticsParam.Key.SEARCHED -import com.tangem.core.analytics.models.AnalyticsParam.Key.SOURCE -import com.tangem.core.analytics.models.AnalyticsParam.Key.TOKEN_PARAM import com.tangem.core.analytics.models.AnalyticsParam.Key.TYPE -import com.tangem.core.analytics.models.AnalyticsParam.ScreensSources /** [REDACTED_AUTHOR] @@ -15,19 +11,6 @@ sealed class SwapAnalyticsEvent( params: Map = emptyMap(), ) : AnalyticsEvent("Swap", event, params) { - data class TokenSelected( - val token: String, - val source: ScreensSources, - val isSearched: Boolean, - ) : SwapAnalyticsEvent( - event = "Token Selected", - params = mapOf( - TOKEN_PARAM to token, - SOURCE to source.value, - SEARCHED to if (isSearched) "True" else "False", - ), - ) - class FilterProvider(filterType: String) : SwapAnalyticsEvent( event = "Filter Provider", params = mapOf(TYPE to filterType), diff --git a/core/config-toggles/CLAUDE.md b/core/config-toggles/CLAUDE.md new file mode 100644 index 0000000000..0d2107635e --- /dev/null +++ b/core/config-toggles/CLAUDE.md @@ -0,0 +1,70 @@ +# core/config-toggles + +Feature toggles (and the related excluded-blockchains toggles). Toggles gate +features by app version; the JSON config is the source of truth and the +`FeatureToggles` enum is generated from it at build time. + +## How it works + +- **Config:** `src/main/assets/configs/feature_toggles_config.json` — a JSON array + of `{ "name": , "version": }` (`ConfigToggle`). +- The **convention plugin** generates the `FeatureToggles` enum (one entry per + `name`) at build time. Reference it as `FeatureToggles.`. +- **Entry point:** `FeatureTogglesManager.isFeatureEnabled(FeatureToggles.X)`. + - `ProdFeatureTogglesManager` (release): a toggle is enabled when the app + version `>=` its `version`. + - `DevFeatureTogglesManager` (tester builds, `BuildConfig.TESTER_MENU_ENABLED`): + runtime-toggleable via the Tester Menu. +- **`version` semantics:** + - `"undefined"` (`DISABLED_FEATURE_TOGGLE_VERSION`) → OFF in prod; can only be + flipped ON via the Tester Menu / dev builds. Use this while a feature is in + development. + - `"X.Y"` (e.g. `5.40`) → ON in prod from that app version onward + (`currentVersion >= localVersion`, see `VersionAvailabilityContract`). + +## Naming convention (ENFORCED by a test) + +- A toggle `name` MUST match `^(AND|TWI)_\d+(?:_[A-Z0-9]+)+$` — start with the + Jira ticket id (`AND_` for Android tickets, `TWI_` for idea tickets), + then an `UPPER_SNAKE_CASE` suffix. Example: `AND_15901_STORIES_CONTAINER_ENABLED`. +- Enforced by `FeatureTogglesNamingConventionTest`. Legacy toggles that predate + the rule are whitelisted in its `EXCLUDED_TOGGLES_LIST` — do **not** add new + names there without an explicit reason. +- The Kotlin interface property stays human-readable **without** the ticket id: + `isStoriesContainerEnabled`. + +## Per-feature toggles & how to add one + +Each feature owns its toggles — feature code reads them through its own +interface, never `FeatureTogglesManager` directly: + +- `api/`: `XxxFeatureToggles` interface — `val isYyyEnabled: Boolean`. +- `impl/`: `DefaultXxxFeatureToggles(featureTogglesManager)` exposes each toggle as + a **getter-backed property**, not a stored value — so it is re-evaluated on every + read (required for runtime toggling via the Tester Menu): + + ```kotlin + override val isYyyEnabled: Boolean + get() = featureTogglesManager.isFeatureEnabled(FeatureToggles.AND__YYY) + ``` + + Never `val isYyyEnabled = featureTogglesManager.isFeatureEnabled(...)` (evaluated + once at construction). +- DI: a `@Provides @Singleton` in the feature's Hilt module returning the interface. + +To add a toggle: + +1. Add `{ "name": "AND__FOO_ENABLED", "version": "undefined" }` to the config + JSON (the enum is regenerated at build). +2. Add `val isFooEnabled` to the feature's `XxxFeatureToggles` and map it in + `DefaultXxxFeatureToggles` (create the interface/impl/DI provider if the + feature has none yet). +3. Gate code on `xxxFeatureToggles.isFooEnabled`. + +## Removing (cleanup) + +When a toggle ships at 100%, set its `version` to the release and run the +`cleanup-feature-toggles` skill — it removes the JSON entry, the interface/impl +members, inlines `true`, and drops dead branches. Mark code that must be deleted +together with a toggle using `@RemoveWithToggle("AND__FOO_ENABLED")` +(`com.tangem.utils.annotations.RemoveWithToggle`); the cleanup skill picks it up. \ No newline at end of file diff --git a/core/config-toggles/src/main/assets/configs/feature_toggles_config.json b/core/config-toggles/src/main/assets/configs/feature_toggles_config.json index bc140e9bf2..4446e6ab40 100644 --- a/core/config-toggles/src/main/assets/configs/feature_toggles_config.json +++ b/core/config-toggles/src/main/assets/configs/feature_toggles_config.json @@ -1,4 +1,8 @@ [ + { + "name": "AND_15901_STORIES_CONTAINER_ENABLED", + "version": "undefined" + }, { "name": "NEW_CARD_SCANNING_ENABLED", "version": "undefined" diff --git a/core/datasource/schemas/com.tangem.datasource.local.txhistory.db.TxHistoryDatabase/1.json b/core/datasource/schemas/com.tangem.datasource.local.txhistory.db.TxHistoryDatabase/1.json index 41c9ded541..cfd76c709e 100644 --- a/core/datasource/schemas/com.tangem.datasource.local.txhistory.db.TxHistoryDatabase/1.json +++ b/core/datasource/schemas/com.tangem.datasource.local.txhistory.db.TxHistoryDatabase/1.json @@ -2,7 +2,7 @@ "formatVersion": 1, "database": { "version": 1, - "identityHash": "442ac578743a8b624777711cf49c77e2", + "identityHash": "55f2651d215126dd0465b9c711165cba", "entities": [ { "tableName": "express_provider", @@ -474,11 +474,88 @@ "address" ] } + }, + { + "tableName": "onramp_country", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`code` TEXT NOT NULL, `name` TEXT NOT NULL, `image` TEXT NOT NULL, `alpha3` TEXT NOT NULL, `continent` TEXT NOT NULL, `onramp_available` INTEGER NOT NULL, `currency_name` TEXT NOT NULL, `currency_code` TEXT NOT NULL, `currency_image` TEXT, `currency_precision` INTEGER NOT NULL, `currency_unit` TEXT NOT NULL, PRIMARY KEY(`code`))", + "fields": [ + { + "fieldPath": "code", + "columnName": "code", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "name", + "columnName": "name", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "image", + "columnName": "image", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "alpha3", + "columnName": "alpha3", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "continent", + "columnName": "continent", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "onrampAvailable", + "columnName": "onramp_available", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "defaultCurrency.name", + "columnName": "currency_name", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "defaultCurrency.code", + "columnName": "currency_code", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "defaultCurrency.image", + "columnName": "currency_image", + "affinity": "TEXT" + }, + { + "fieldPath": "defaultCurrency.precision", + "columnName": "currency_precision", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "defaultCurrency.unit", + "columnName": "currency_unit", + "affinity": "TEXT", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "code" + ] + } } ], "setupQueries": [ "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '442ac578743a8b624777711cf49c77e2')" + "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '55f2651d215126dd0465b9c711165cba')" ] } } \ No newline at end of file diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/auth/AuthApi.kt b/core/datasource/src/main/java/com/tangem/datasource/api/auth/AuthApi.kt index 1161483d0c..68aec6cd5a 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/api/auth/AuthApi.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/api/auth/AuthApi.kt @@ -4,6 +4,7 @@ import com.tangem.datasource.api.auth.models.request.AuthApiRequest import com.tangem.datasource.api.auth.models.request.NonceApiRequest import com.tangem.datasource.api.auth.models.request.RefreshApiRequest import com.tangem.datasource.api.auth.models.request.RegisterApiRequest +import com.tangem.datasource.api.auth.models.request.WalletRegistrationRequest import com.tangem.datasource.api.auth.models.response.NonceApiResponse import com.tangem.datasource.api.auth.models.response.TokenApiResponse import com.tangem.datasource.api.common.response.ApiResponse @@ -30,8 +31,7 @@ interface AuthApi { * session token pair. Called once per app install. */ @POST("api/v1/auth/register") - @RequiresDpopProof - suspend fun register(@Body request: RegisterApiRequest): ApiResponse + suspend fun registerDevice(@Body request: RegisterApiRequest): ApiResponse /** * Request authentication nonce. @@ -61,4 +61,23 @@ interface AuthApi { @POST("api/v1/auth/refresh") @RequiresDpopProof suspend fun refresh(@Body request: RefreshApiRequest): ApiResponse + + /** + * Request wallet registration nonce. + * + * Generates a nonce bound to the device public key for the wallet registration flow. + */ + @POST("api/v1/auth/nonce/wallet") + suspend fun requestWalletNonce(@Body request: NonceApiRequest): ApiResponse + + /** + * Register a wallet. + * + * Binds a new wallet to an already-registered device. When a card signature is provided the + * wallet is bound as COLD (card-backed); otherwise it is registered as a MOBILE (hot) wallet. + * Returns refreshed session tokens reflecting the updated wallet list. + */ + @POST("api/v1/auth/wallet") + @RequiresDpopProof + suspend fun registerWallet(@Body request: WalletRegistrationRequest): ApiResponse } \ No newline at end of file diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/auth/models/request/DeviceMetadata.kt b/core/datasource/src/main/java/com/tangem/datasource/api/auth/models/request/DeviceMetadata.kt index 960957a6a4..b381ec0359 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/api/auth/models/request/DeviceMetadata.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/api/auth/models/request/DeviceMetadata.kt @@ -10,17 +10,17 @@ import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) data class DeviceMetadata( /** Device hardware model (e.g. `iPhone 15 Pro`). */ - @Json(name = "deviceModel") val deviceModel: String?, + @Json(name = "deviceModel") val deviceModel: String, /** Operating system (`android` / `ios`). */ @Json(name = "os") val os: String, /** OS version string (e.g. `17.4.1`). */ - @Json(name = "osVersion") val osVersion: String?, + @Json(name = "osVersion") val osVersion: String, /** Application version (e.g. `5.8.0`). */ - @Json(name = "appVersion") val appVersion: String?, + @Json(name = "appVersion") val appVersion: String, /** User-Agent header (e.g. `Tangem/5.8.0 (iPhone; iOS 17.4.1; Scale/3.00)`). */ - @Json(name = "userAgent") val userAgent: String?, + @Json(name = "userAgent") val userAgent: String, /** Client locale (e.g. `en-US`). */ - @Json(name = "locale") val locale: String?, + @Json(name = "locale") val locale: String, /** Client timezone (e.g. `Europe/Moscow`). */ - @Json(name = "timezone") val timezone: String?, + @Json(name = "timezone") val timezone: String, ) \ No newline at end of file diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/auth/models/request/WalletRegistrationRequest.kt b/core/datasource/src/main/java/com/tangem/datasource/api/auth/models/request/WalletRegistrationRequest.kt new file mode 100644 index 0000000000..8e9ce11c2e --- /dev/null +++ b/core/datasource/src/main/java/com/tangem/datasource/api/auth/models/request/WalletRegistrationRequest.kt @@ -0,0 +1,46 @@ +package com.tangem.datasource.api.auth.models.request + +import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass + +/** + * Wallet registration request — binds a new wallet to an already-registered device. + * + * When [cardSignature] (and the accompanying [cardSignatureSalt] / [walletStatus]) is provided the + * wallet is bound as COLD (card-backed); otherwise it is registered as a MOBILE (hot) wallet. + * Mirrors the `WalletRegistrationRequest` schema in the backend OpenAPI contract. + */ +@JsonClass(generateAdapter = true) +data class WalletRegistrationRequest( + /** Deciphered nonce value from `/api/v1/auth/nonce/wallet`. */ + @Json(name = "nonce") val nonce: String, + /** + * Wallet identifier — Base64-encoded + * `HMAC-SHA256(key = SHA-256(walletPublicKey), data = "UserWalletID")`. + */ + @Json(name = "walletId") val walletId: String, + /** + * Base64-encoded secp256k1 RSV signature (65 bytes) over `sha256(nonce || walletSignatureSalt)`. + * The server recovers `walletPublicKey` from this signature. + */ + @Json(name = "walletSignature") val walletSignature: String, + /** Base64-encoded salt used in the wallet signature hash. */ + @Json(name = "walletSignatureSalt") val walletSignatureSalt: String, + /** + * Base64-encoded secp256k1 RSV signature (65 bytes) over + * `sha256(walletPublicKey || nonce || cardSignatureSalt || walletStatus)`. Required for + * cold-wallet registration; `null` for mobile (hot) wallets. + */ + @Json(name = "cardSignature") val cardSignature: String?, + /** Base64-encoded salt used in the card signature hash. Required for cold-wallet registration. */ + @Json(name = "cardSignatureSalt") val cardSignatureSalt: String?, + /** + * Base64-encoded single byte describing wallet provenance on the card + * (`0x82` = generated on card, `0xC2` = SEED imported). Required for cold-wallet registration. + */ + @Json(name = "walletStatus") val walletStatus: String?, + /** Platform attestation token (Play Integrity / App Attest). */ + @Json(name = "attestationToken") val attestationToken: String?, + /** Client-reported device metadata. */ + @Json(name = "metadata") val metadata: DeviceMetadata, +) \ No newline at end of file diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechApi.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechApi.kt index 7530892018..244998c682 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechApi.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechApi.kt @@ -52,16 +52,16 @@ interface TangemTechApi { @Body userTokens: UserTokensResponse, ): ApiResponse - @GET("/v1/wallets/{wallet_id}/notification-preferences") + @GET("/api/v1/notification-preferences/{wallet_id}") suspend fun getPushNotificationPreferences( @Path("wallet_id") walletId: String, ): ApiResponse - @PUT("/v1/wallets/{wallet_id}/notification-preferences") + @PUT("/api/v1/notification-preferences/{wallet_id}") suspend fun updatePushNotificationPreferences( @Path("wallet_id") walletId: String, @Body body: PushNotificationPreferencesBody, - ): ApiResponse + ): ApiResponse // region Referral /** Returns referral status by [walletId] */ diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/PushNotificationPreferenceState.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/PushNotificationPreferenceState.kt deleted file mode 100644 index 9d95473183..0000000000 --- a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/PushNotificationPreferenceState.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.tangem.datasource.api.tangemTech.models - -import com.squareup.moshi.Json -import com.squareup.moshi.JsonClass - -@JsonClass(generateAdapter = true) -data class PushNotificationPreferenceState( - @Json(name = "isEnabled") val isEnabled: Boolean, - @Json(name = "isVisible") val isVisible: Boolean, -) \ No newline at end of file diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/PushNotificationPreferencesBody.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/PushNotificationPreferencesBody.kt index 01a4c76dcd..9b7ce52ebe 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/PushNotificationPreferencesBody.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/PushNotificationPreferencesBody.kt @@ -5,10 +5,10 @@ import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) data class PushNotificationPreferencesBody( - @Json(name = "transactionAlerts") - val areTransactionAlertsEnabled: Boolean, - @Json(name = "offersUpdates") - val areOffersUpdatesEnabled: Boolean, - @Json(name = "priceAlerts") + @Json(name = "transactionEventsEnabled") + val areTransactionEventsEnabled: Boolean, + @Json(name = "offerUpdatesEnabled") + val areOfferUpdatesEnabled: Boolean, + @Json(name = "priceAlertsEnabled") val arePriceAlertsEnabled: Boolean, ) \ No newline at end of file diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/PushNotificationPreferencesResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/PushNotificationPreferencesResponse.kt index 25606b8a6e..e67a3dbcb5 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/PushNotificationPreferencesResponse.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/PushNotificationPreferencesResponse.kt @@ -5,7 +5,7 @@ import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) data class PushNotificationPreferencesResponse( - @Json(name = "transactionAlerts") val transactionAlerts: PushNotificationPreferenceState, - @Json(name = "offersUpdates") val offersUpdates: PushNotificationPreferenceState, - @Json(name = "priceAlerts") val priceAlerts: PushNotificationPreferenceState, + @Json(name = "transactionEventsEnabled") val areTransactionEventsEnabled: Boolean, + @Json(name = "offerUpdatesEnabled") val areOfferUpdatesEnabled: Boolean, + @Json(name = "priceAlertsEnabled") val arePriceAlertsEnabled: Boolean, ) \ No newline at end of file diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/converter/OnrampCountryEntityConverter.kt b/core/datasource/src/main/java/com/tangem/datasource/local/converter/OnrampCountryEntityConverter.kt new file mode 100644 index 0000000000..56ec2a01f8 --- /dev/null +++ b/core/datasource/src/main/java/com/tangem/datasource/local/converter/OnrampCountryEntityConverter.kt @@ -0,0 +1,23 @@ +package com.tangem.datasource.local.converter + +import com.tangem.datasource.api.onramp.models.response.model.OnrampCountryDTO +import com.tangem.datasource.local.txhistory.db.entity.express.OnrampCountryEntity + +/** Maps an [OnrampCountryDTO] API response into its persisted [OnrampCountryEntity]. */ +fun OnrampCountryDTO.toEntity(): OnrampCountryEntity { + return OnrampCountryEntity( + code = code, + name = name, + image = image, + alpha3 = alpha3, + continent = continent, + isOnrampAvailable = onrampAvailable, + defaultCurrency = OnrampCountryEntity.CurrencyEmbedded( + name = defaultCurrency.name, + code = defaultCurrency.code, + image = defaultCurrency.image, + precision = defaultCurrency.precision, + unit = defaultCurrency.unit ?: defaultCurrency.code, + ), + ) +} \ No newline at end of file diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/txhistory/db/TxHistoryDatabase.kt b/core/datasource/src/main/java/com/tangem/datasource/local/txhistory/db/TxHistoryDatabase.kt index 549e980d64..331c2ce3e7 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/local/txhistory/db/TxHistoryDatabase.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/local/txhistory/db/TxHistoryDatabase.kt @@ -8,6 +8,7 @@ import com.tangem.datasource.local.txhistory.db.entity.express.ExpressSyncStateE import com.tangem.datasource.local.txhistory.db.entity.express.ExpressExchangeEntity import com.tangem.datasource.local.txhistory.db.entity.express.ExpressOnrampEntity import com.tangem.datasource.local.txhistory.db.entity.express.ExpressProviderEntity +import com.tangem.datasource.local.txhistory.db.entity.express.OnrampCountryEntity @Database( version = 1, @@ -16,6 +17,7 @@ import com.tangem.datasource.local.txhistory.db.entity.express.ExpressProviderEn ExpressExchangeEntity::class, ExpressOnrampEntity::class, ExpressSyncStateEntity::class, + OnrampCountryEntity::class, ], ) abstract class TxHistoryDatabase : RoomDatabase() { diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/txhistory/db/dao/ExpressHistoryDao.kt b/core/datasource/src/main/java/com/tangem/datasource/local/txhistory/db/dao/ExpressHistoryDao.kt index 802598fc3d..9736bc2b17 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/local/txhistory/db/dao/ExpressHistoryDao.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/local/txhistory/db/dao/ExpressHistoryDao.kt @@ -8,6 +8,7 @@ import androidx.room.Query import com.tangem.datasource.local.txhistory.db.entity.express.ExpressExchangeEntity import com.tangem.datasource.local.txhistory.db.entity.express.ExpressOnrampEntity import com.tangem.datasource.local.txhistory.db.entity.express.ExpressProviderEntity +import com.tangem.datasource.local.txhistory.db.entity.express.OnrampCountryEntity import kotlinx.coroutines.flow.Flow @Dao @@ -22,12 +23,19 @@ interface ExpressHistoryDao { @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun upsertOnramps(items: List) + @Insert(onConflict = OnConflictStrategy.REPLACE) + suspend fun upsertCountries(items: List) + /** * All persisted providers keyed by [ExpressProviderEntity.id] */ @Query("SELECT * FROM express_provider") fun getProvidersById(): Flow> + /** All persisted onramp countries keyed by [OnrampCountryEntity.code]. */ + @Query("SELECT * FROM onramp_country") + fun getCountriesByCode(): Flow> + /** * Outgoing swaps: the viewed currency is the swap's `from` side, so the row is stored under this * address ([ExpressExchangeEntity.ownerAddress] == fromAddress). Join to on-chain by `payin_hash`. diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/txhistory/db/entity/express/OnrampCountryEntity.kt b/core/datasource/src/main/java/com/tangem/datasource/local/txhistory/db/entity/express/OnrampCountryEntity.kt new file mode 100644 index 0000000000..5ee6ac7ddd --- /dev/null +++ b/core/datasource/src/main/java/com/tangem/datasource/local/txhistory/db/entity/express/OnrampCountryEntity.kt @@ -0,0 +1,52 @@ +package com.tangem.datasource.local.txhistory.db.entity.express + +import androidx.room.ColumnInfo +import androidx.room.Embedded +import androidx.room.Entity +import androidx.room.PrimaryKey + +/** Persisted onramp country, matched to a transaction by [code] == [ExpressOnrampEntity.countryCode]. */ +@Entity(tableName = "onramp_country") +data class OnrampCountryEntity( + + @PrimaryKey + @ColumnInfo(name = "code") + val code: String, + + @ColumnInfo(name = "name") + val name: String, + + @ColumnInfo(name = "image") + val image: String, + + @ColumnInfo(name = "alpha3") + val alpha3: String, + + @ColumnInfo(name = "continent") + val continent: String, + + @ColumnInfo(name = "onramp_available") + val isOnrampAvailable: Boolean, + + @Embedded(prefix = "currency_") + val defaultCurrency: CurrencyEmbedded, +) { + + data class CurrencyEmbedded( + + @ColumnInfo(name = "name") + val name: String, + + @ColumnInfo(name = "code") + val code: String, + + @ColumnInfo(name = "image") + val image: String?, + + @ColumnInfo(name = "precision") + val precision: Int, + + @ColumnInfo(name = "unit") + val unit: String, + ) +} \ No newline at end of file diff --git a/core/ui/ds-tokens b/core/ui/ds-tokens index 76d6a50dc3..42aac70c1d 160000 --- a/core/ui/ds-tokens +++ b/core/ui/ds-tokens @@ -1 +1 @@ -Subproject commit 76d6a50dc3161cfc6cc7055afc8ce4ba619ac5c6 +Subproject commit 42aac70c1d2d0d636470fa476703cab353010bba diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/account/AccountIcon.kt b/core/ui/src/main/java/com/tangem/core/ui/components/account/AccountIcon.kt index 35901d7a10..001c7069af 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/account/AccountIcon.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/account/AccountIcon.kt @@ -32,7 +32,7 @@ import com.tangem.core.ui.res.TangemThemePreview import com.tangem.core.ui.res.TangemThemePreviewRedesign enum class AccountIconSize { - Default, Large, Medium, Small, ExtraSmall, RedesignedDefault, RedesignExtraSmall + Default, Large, Medium, Small, ExtraSmall, RedesignedDefault, RedesignExtraSmall, RedesignLarge, Contact } /** @@ -132,6 +132,8 @@ fun AccountCharIcon(char: Char, color: Color, size: AccountIconSize, modifier: M AccountIconSize.ExtraSmall -> TangemTheme.typography.caption1 AccountIconSize.RedesignedDefault -> TangemTheme.typography2.headingSemibold28 AccountIconSize.RedesignExtraSmall -> TangemTheme.typography2.captionMedium11 + AccountIconSize.RedesignLarge -> TangemTheme.typography3.heading.medium + AccountIconSize.Contact -> TangemTheme.typography3.body.medium } val textSize by animateFloatAsState( @@ -166,6 +168,8 @@ private fun AccountIconSize.iconSizeInDp(): Dp = when (this) { AccountIconSize.ExtraSmall -> 8.dp AccountIconSize.RedesignedDefault -> 20.dp AccountIconSize.RedesignExtraSmall -> 8.dp + AccountIconSize.RedesignLarge -> 32.dp + AccountIconSize.Contact -> 20.dp } fun AccountIconSize.toBoxSize(): Dp = when (this) { @@ -176,6 +180,8 @@ fun AccountIconSize.toBoxSize(): Dp = when (this) { AccountIconSize.ExtraSmall -> 14.dp AccountIconSize.RedesignedDefault -> 40.dp AccountIconSize.RedesignExtraSmall -> 16.dp + AccountIconSize.RedesignLarge -> 80.dp + AccountIconSize.Contact -> 40.dp } private fun AccountIconSize.boxShapeSizeInDp(): Dp = when (this) { @@ -186,6 +192,8 @@ private fun AccountIconSize.boxShapeSizeInDp(): Dp = when (this) { AccountIconSize.ExtraSmall -> 4.dp AccountIconSize.RedesignedDefault -> 12.dp AccountIconSize.RedesignExtraSmall -> 6.dp + AccountIconSize.RedesignLarge -> 80.dp + AccountIconSize.Contact -> 100.dp } @Preview(showBackground = true) @@ -228,7 +236,9 @@ private fun Sample() { AccountIconSize.Small -> AccountIconSize.ExtraSmall AccountIconSize.ExtraSmall -> AccountIconSize.RedesignedDefault AccountIconSize.RedesignedDefault -> AccountIconSize.RedesignExtraSmall - AccountIconSize.RedesignExtraSmall -> AccountIconSize.Default + AccountIconSize.RedesignExtraSmall -> AccountIconSize.RedesignLarge + AccountIconSize.RedesignLarge -> AccountIconSize.Contact + AccountIconSize.Contact -> AccountIconSize.Default } }) { Text("Change") } diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/stories/StoriesContainer.kt b/core/ui/src/main/java/com/tangem/core/ui/components/stories/StoriesContainer.kt index bc292ff0d0..acf73b18d4 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/stories/StoriesContainer.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/stories/StoriesContainer.kt @@ -51,7 +51,10 @@ inline fun StoriesContainer( ) { var watchedCounter by remember { mutableIntStateOf(1) } var isPressed by remember { mutableStateOf(value = false) } - val storyState by remember(config) { + // Key on content (stories + repeatability), not the whole config object: an unrelated change + // to the config instance (e.g. a caller folding a changing flag into it) must not recreate the + // state machine and rewind stories to the first page. + val storyState by remember(config.stories, config.isRestartable) { mutableStateOf( StoriesStepStateMachine( stories = config.stories, @@ -59,7 +62,9 @@ inline fun StoriesContainer( ), ) } - BackHandler(onBack = { config.onClose(watchedCounter) }) + if (config.isCloseButtonVisible) { + BackHandler(onBack = { config.onClose(watchedCounter) }) + } val isPaused = isPressed || isPauseStories @@ -90,22 +95,24 @@ inline fun StoriesContainer( paused = isPaused, onStepFinish = onNextClick, ) - Icon( - painter = rememberVectorPainter( - image = ImageVector.vectorResource(R.drawable.ic_close_24), - ), - tint = TangemTheme.colors.icon.constant, - contentDescription = null, - modifier = Modifier - .align(Alignment.End) - .padding(top = 14.dp, end = 16.dp) - .clickable( - interactionSource = remember { MutableInteractionSource() }, - indication = LocalIndication.current, - onClick = { config.onClose(watchedCounter) }, - ) - .testTag(SwapStoriesScreenTestTags.CLOSE_BUTTON), - ) + if (config.isCloseButtonVisible) { + Icon( + painter = rememberVectorPainter( + image = ImageVector.vectorResource(R.drawable.ic_close_24), + ), + tint = TangemTheme.colors.icon.constant, + contentDescription = null, + modifier = Modifier + .align(Alignment.End) + .padding(top = 14.dp, end = 16.dp) + .clickable( + interactionSource = remember { MutableInteractionSource() }, + indication = LocalIndication.current, + onClick = { config.onClose(watchedCounter) }, + ) + .testTag(SwapStoriesScreenTestTags.CLOSE_BUTTON), + ) + } } } } diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/stories/model/StoriesContentConfig.kt b/core/ui/src/main/java/com/tangem/core/ui/components/stories/model/StoriesContentConfig.kt index 07e03327ab..e8beb9581b 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/stories/model/StoriesContentConfig.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/stories/model/StoriesContentConfig.kt @@ -5,13 +5,18 @@ import kotlinx.collections.immutable.ImmutableList /** * Config for stories component * - * @property stories configuration list + * @property stories configuration list * @property isRestartable indicates than stories progressions starts + * @property isCloseButtonVisible whether the top-right close button (and back handler) is shown. + * Set `false` for non-closable stories (e.g. a root intro screen); [onClose] is then irrelevant. + * @property onClose invoked with the number of watched stories when the user closes them. + * Only meaningful when [isCloseButtonVisible] is `true`; defaults to a no-op for non-closable stories. */ interface StoriesContentConfig { val stories: ImmutableList val isRestartable: Boolean - val onClose: (Int) -> Unit + val isCloseButtonVisible: Boolean get() = true + val onClose: (Int) -> Unit get() = {} } interface StoryConfig { diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/TransactionItem.kt b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/TransactionItem.kt index a0c9c33daa..0cacb2de38 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/TransactionItem.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/TransactionItem.kt @@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -32,6 +33,8 @@ import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import com.tangem.core.ui.R +import com.tangem.core.ui.components.currency.icon.CurrencyIcon +import com.tangem.core.ui.components.currency.icon.CurrencyIconState import com.tangem.core.ui.components.icons.identicon.IdentIcon import com.tangem.core.ui.components.transactions.state.TransactionItemUM import com.tangem.core.ui.components.transactions.state.TransactionItemUM.Content.Direction @@ -70,55 +73,92 @@ fun TransactionItem(state: TransactionItemUM, isBalanceHidden: Boolean, modifier @Composable private fun ContentItem(state: TransactionItemUM.Content, isBalanceHidden: Boolean, modifier: Modifier = Modifier) { - val rowModifier = modifier - .fillMaxWidth() - .clickable(onClick = state.onClick) - .testTag(TransactionHistoryItemTestTags.ITEM) - - TangemRowContainer( - modifier = rowModifier, - contentPadding = PaddingValues( - horizontal = TangemTheme.dimens2.x4, - vertical = TangemTheme.dimens2.x3, - ), + Column( + modifier = modifier + .fillMaxWidth() + .clickable(onClick = state.onClick) + .testTag(TransactionHistoryItemTestTags.ITEM), ) { - StatusCircle( - iconRes = state.iconRes, - status = state.status, - modifier = Modifier - .layoutId(TangemRowLayoutId.HEAD) - .padding(end = TangemTheme.dimens2.x3) - .size(TangemTheme.dimens2.x10) - .testTag(TransactionHistoryItemTestTags.STATUS_PREFIX + state.status.testTagSuffix), + TangemRowContainer( + contentPadding = PaddingValues( + horizontal = TangemTheme.dimens2.x4, + vertical = TangemTheme.dimens2.x3, + ), + ) { + StatusCircle( + iconRes = state.iconRes, + status = state.status, + modifier = Modifier + .layoutId(TangemRowLayoutId.HEAD) + .padding(end = TangemTheme.dimens2.x3) + .size(TangemTheme.dimens2.x10) + .testTag(TransactionHistoryItemTestTags.STATUS_PREFIX + state.status.testTagSuffix), + ) + TitleText( + title = state.title, + status = state.status, + modifier = Modifier + .layoutId(TangemRowLayoutId.START_TOP) + .testTag(TransactionHistoryItemTestTags.TITLE), + ) + SubtitleText( + subtitle = state.subtitle, + status = state.status, + modifier = Modifier + .layoutId(TangemRowLayoutId.START_BOTTOM) + .padding(top = TangemTheme.dimens2.x0_5), + ) + state.amount?.let { amount -> + AmountText( + amount = amount, + status = state.status, + isBalanceHidden = isBalanceHidden, + modifier = Modifier + .layoutId(TangemRowLayoutId.END_TOP) + .testTag(TransactionHistoryItemTestTags.AMOUNT), + ) + } + CurrencyText( + symbol = state.currencySymbol, + modifier = Modifier + .layoutId(TangemRowLayoutId.END_BOTTOM) + .padding(top = TangemTheme.dimens2.x0_5) + .testTag(TransactionHistoryItemTestTags.CURRENCY), + ) + } + state.warning?.let { warning -> + WarningLine( + warning = warning, + modifier = Modifier.padding( + start = TangemTheme.dimens2.x4, + end = TangemTheme.dimens2.x4, + bottom = TangemTheme.dimens2.x3, + ), + ) + } + } +} + +@Composable +private fun WarningLine(warning: TextReference, modifier: Modifier = Modifier) { + val attention = TangemTheme.colors2.text.status.attention + Row( + modifier = modifier, + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens2.x2), + ) { + Icon( + painter = painterResource(R.drawable.ic_alert_triangle_20), + contentDescription = null, + tint = attention, + modifier = Modifier.size(TangemTheme.dimens2.x5), ) - TitleText( - title = state.title, - status = state.status, - modifier = Modifier - .layoutId(TangemRowLayoutId.START_TOP) - .testTag(TransactionHistoryItemTestTags.TITLE), - ) - SubtitleText( - subtitle = state.subtitle, - status = state.status, - modifier = Modifier - .layoutId(TangemRowLayoutId.START_BOTTOM) - .padding(top = TangemTheme.dimens2.x0_5), - ) - AmountText( - amount = state.amount, - status = state.status, - isBalanceHidden = isBalanceHidden, - modifier = Modifier - .layoutId(TangemRowLayoutId.END_TOP) - .testTag(TransactionHistoryItemTestTags.AMOUNT), - ) - CurrencyText( - symbol = state.currencySymbol, - modifier = Modifier - .layoutId(TangemRowLayoutId.END_BOTTOM) - .padding(top = TangemTheme.dimens2.x0_5) - .testTag(TransactionHistoryItemTestTags.CURRENCY), + Text( + text = warning.resolveReference(), + color = attention, + style = TangemTheme.typography2.captionMedium12, + maxLines = 2, + overflow = TextOverflow.Ellipsis, ) } } @@ -262,6 +302,21 @@ private fun SubtitleText(subtitle: ContentSubtitle, status: Status, modifier: Mo modifier = Modifier.fillMaxSize(), ) } + is ContentSubtitle.Asset -> InlineImageSubtitle( + template = stringResourceSafe(subtitle.direction.templateResId(), subtitle.symbol), + color = tertiary, + afterIconColor = if (isFailed) tertiary else primary, + modifier = modifier, + ) { + subtitle.icon?.let { iconState -> + CurrencyIcon( + state = iconState, + shouldDisplayNetwork = false, + withFixedSize = false, + modifier = Modifier.fillMaxSize(), + ) + } + } } } @@ -491,4 +546,73 @@ private fun Preview_TransactionItem_Swap() { } } +@Preview(showBackground = true, widthDp = 360) +@Preview(showBackground = true, widthDp = 360, uiMode = Configuration.UI_MODE_NIGHT_YES) +@Composable +private fun Preview_TransactionItem_Express() { + TangemThemePreviewRedesign { + PreviewColumn( + items = listOf( + TransactionItemUM.Content( + txHash = "exp-swap-u", + amount = "-390.00", + currencySymbol = "USDT", + time = "", + status = Status.Unconfirmed, + direction = Direction.OUTGOING, + onClick = {}, + iconRes = R.drawable.ic_exchange_vertical_24, + title = stringReference("Swapping"), + subtitle = ContentSubtitle.Asset( + direction = ContentSubtitle.Direction.TO, + symbol = "POL", + icon = CurrencyIconState.CoinIcon( + url = null, + fallbackResId = R.drawable.ic_custom_token_44, + isGrayscale = false, + shouldShowCustomBadge = false, + ), + ), + timestamp = 0L, + warning = stringReference("KYC verification required by provider"), + ), + TransactionItemUM.Content( + txHash = "exp-onramp-c", + amount = "+0.006339", + currencySymbol = "BTC", + time = "", + status = Status.Confirmed, + direction = Direction.INCOMING, + onClick = {}, + iconRes = R.drawable.ic_tangem_card_24, + title = stringReference("Topped up"), + subtitle = ContentSubtitle.Asset( + direction = ContentSubtitle.Direction.FROM, + symbol = "SEK", + icon = null, + ), + timestamp = 0L, + ), + TransactionItemUM.Content( + txHash = "exp-onramp-f", + amount = "0.006339", + currencySymbol = "BTC", + time = "", + status = Status.Failed, + direction = Direction.INCOMING, + onClick = {}, + iconRes = R.drawable.ic_tangem_card_24, + title = stringReference("Top up failed"), + subtitle = ContentSubtitle.Asset( + direction = ContentSubtitle.Direction.FROM, + symbol = "SEK", + icon = null, + ), + timestamp = 0L, + ), + ), + ) + } +} + // endregion \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/state/TransactionItemUM.kt b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/state/TransactionItemUM.kt index 1c3adfcd0e..7bce8ba673 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/state/TransactionItemUM.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/state/TransactionItemUM.kt @@ -3,6 +3,7 @@ package com.tangem.core.ui.components.transactions.state import androidx.annotation.DrawableRes import androidx.compose.runtime.Immutable import androidx.compose.ui.graphics.Color +import com.tangem.core.ui.components.currency.icon.CurrencyIconState import com.tangem.core.ui.ds.image.DeviceIconUM import com.tangem.core.ui.extensions.TextReference @@ -22,12 +23,13 @@ sealed interface TransactionItemUM { /** * Content state. * - * @property amount signed numeric value, e.g. "+0.500913" / "-350.31"; no currency symbol embedded + * @property amount signed numeric value, e.g. "+0.500913" / "-350.31"; no currency symbol embedded. + * `null` hides the numeric value while [currencySymbol] still shows. * @property currencySymbol currency symbol shown alongside [amount], e.g. "BTC", "USDT" */ data class Content( override val txHash: String, - val amount: String, + val amount: String?, val currencySymbol: String, val time: String, val status: Status, @@ -37,6 +39,7 @@ sealed interface TransactionItemUM { val title: TextReference, val subtitle: ContentSubtitle, val timestamp: Long, + val warning: TextReference? = null, ) : TransactionItemUM { @Immutable @@ -95,6 +98,19 @@ sealed interface TransactionItemUM { val deviceIconUM: DeviceIconUM, ) : ContentSubtitle + /** + * Counterparty asset ticker — renders as "to/from: ". Used for express rows + * (swap counterparty currency / onramp fiat), e.g. "to: ◎ POL" or "from: 🇸🇪 SEK". + * + * @property icon resolved counterparty currency icon, rendered via `CurrencyIcon`. `null` when no icon + * is available (e.g. onramp fiat carries no `CryptoCurrency`) — the ticker then renders without a leading icon. + */ + data class Asset( + val direction: Direction, + val symbol: String, + val icon: CurrencyIconState?, + ) : ContentSubtitle + enum class Direction { TO, FROM } } diff --git a/core/ui/src/main/java/com/tangem/core/ui/ds2/glowring/TangemGlowRing.kt b/core/ui/src/main/java/com/tangem/core/ui/ds2/glowring/TangemGlowRing.kt new file mode 100644 index 0000000000..b8b5f4b822 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/ds2/glowring/TangemGlowRing.kt @@ -0,0 +1,297 @@ +@file:Suppress("MagicNumber") + +package com.tangem.core.ui.ds2.glowring + +import android.os.Build +import androidx.compose.animation.core.CubicBezierEasing +import androidx.compose.animation.core.LinearEasing +import androidx.compose.animation.core.RepeatMode +import androidx.compose.animation.core.animateFloat +import androidx.compose.animation.core.infiniteRepeatable +import androidx.compose.animation.core.rememberInfiniteTransition +import androidx.compose.animation.core.tween +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxScope +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.lerp +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import com.tangem.core.ui.res.TangemTheme +import com.tangem.core.ui.res.TangemThemePreviewRedesign +import com.tangem.core.ui.res.generated.TangemColors3 + +/** + * Design-system v2 (DS3) **Glow Ring** — an animated angular-gradient halo that runs around a + * rounded-rect outline, like lights chasing along the border. + * + * [Figma](https://www.figma.com/design/AsnJ5CPHib4Qxw12gszjMS/%F0%9F%92%A0-DS-Components?node-id=4933-126&m=dev) + * + * @param modifier Modifier for the whole component; also defines its size when there is no [content]. + * @param variant Color theme of the gradient — see [TangemGlowRing.Variant]. + * @param cornerRadius Corner radius of the ring; should match the radius of the wrapped surface. + * @param animated When `false`, the ring is rendered static (no rotation). + * @param quality Rendering strategy; defaults to [TangemGlowRing.Quality.Auto] (device-appropriate). + * Force [TangemGlowRing.Quality.LayeredStrokes] to preview the pre-Android-12 fallback on any device. + * @param contentDescription Accessibility label; pass a value when the ring conveys state (e.g. error), + * leave `null` when it is purely decorative. + * @param content Optional content drawn inside/over the ring. + */ +@Composable +fun TangemGlowRing( + modifier: Modifier = Modifier, + variant: TangemGlowRing.Variant = TangemGlowRing.Variant.Magic, + cornerRadius: Dp = 24.dp, + animated: Boolean = true, + quality: TangemGlowRing.Quality = TangemGlowRing.Quality.Auto, + contentDescription: String? = null, + content: @Composable BoxScope.() -> Unit = {}, +) { + val resolved = remember(quality) { resolveQuality(quality) } + val stops = rememberGlowRingStops(variant, animated) + val metrics = remember { + GlowRingMetrics(coreWidth = 2.dp, ringWidth = 4.dp, blurMid = 8.dp, blurBottom = 16.dp) + } + + val angle = if (animated) { + val transition = rememberInfiniteTransition(label = "glowRing") + val rotation by transition.animateFloat( + initialValue = GLOW_RING_START_ANGLE, + targetValue = 270f, + animationSpec = infiniteRepeatable( + animation = tween( + durationMillis = 24_000, + easing = CubicBezierEasing(a = 0.1f, b = 0f, c = 0.9f, d = 1f), + ), + repeatMode = RepeatMode.Restart, + ), + label = "angle", + ) + rotation + } else { + GLOW_RING_START_ANGLE + } + + Box( + modifier = if (contentDescription != null) { + modifier.semantics { this.contentDescription = contentDescription } + } else { + modifier + }, + ) { + val ringModifier = Modifier.matchParentSize() + when (resolved) { + ResolvedGlowRingQuality.Blur -> BlurGlowRing( + angle = angle, + stops = stops, + cornerRadius = cornerRadius, + metrics = metrics, + modifier = ringModifier, + ) + ResolvedGlowRingQuality.LayeredStrokes -> LayeredStrokesGlowRing( + angle = angle, + stops = stops, + cornerRadius = cornerRadius, + metrics = metrics, + modifier = ringModifier, + ) + } + content() + } +} + +/** Sweep start angle, also reused as the static angle when [TangemGlowRing] is not animated (Figma: -90°). */ +private const val GLOW_RING_START_ANGLE = -90f + +/** + * Resolves the gradient stops for [variant] from the DS3 `colors3.glow` tokens. The + * [TangemGlowRing.Variant.Magic] variant continuously ping-pongs between gradient A (`glow.magic`) and + * gradient B (`glow.magicBlend`) while [animated] is `true`; every other variant has a single static + * gradient. + */ +@Composable +private fun rememberGlowRingStops(variant: TangemGlowRing.Variant, animated: Boolean): List> { + val glow = TangemTheme.colors3.glow + if (variant != TangemGlowRing.Variant.Magic || !animated) { + return variant.stops(glow) + } + val morphTransition = rememberInfiniteTransition(label = "glowRingMorph") + val mix by morphTransition.animateFloat( + initialValue = 0f, + targetValue = 1f, + animationSpec = infiniteRepeatable( + // 6s A→B half-period; Reverse makes a 12s ping-pong (Figma morphDur = 12s). + animation = tween(durationMillis = 6_000, easing = LinearEasing), + repeatMode = RepeatMode.Reverse, + ), + label = "morphMix", + ) + return morphedMagicStops(glow.magic.steps(), glow.magicBlend.steps(), mix) +} + +/** Public API surface of [TangemGlowRing]. */ +object TangemGlowRing { + + /** Color theme of the glow ring gradient. */ + enum class Variant { + /** + * Multi-color "magic" gradient that continuously auto-morphs (ping-pongs) between separated + * orange / blue / purple arcs and a continuous fully-saturated blend. + */ + Magic, + + /** Green success glow. */ + Success, + + /** Red error glow. */ + Error, + + /** Orange/amber warning glow. */ + Warning, + + /** Blue informational glow. */ + Info, + } + + /** + * Rendering strategy for the glow. + * + * [Auto] picks the best renderer for the current device — a real Gaussian blur on Android 12+ + * (API 31) and a layered-stroke approximation on older versions. The explicit values force one + * renderer regardless of API level; they exist mainly for previews / Storybook so the + * pre-Android-12 fallback can be inspected on a modern device. Product code should use [Auto]. + */ + enum class Quality { + /** Auto-detect the renderer from the device API level (recommended). */ + Auto, + + /** Force the Android 12+ real-blur renderer. */ + Blur, + + /** Force the pre-Android-12 layered-stroke fallback. */ + LayeredStrokes, + } +} + +/** + * Resolves [quality] to a concrete renderer. [TangemGlowRing.Quality.Auto] picks a real blur on + * Android 12+ (API 31) and falls back to stacked translucent strokes on older versions; the explicit + * values force their renderer regardless of API level. + */ +private fun resolveQuality(quality: TangemGlowRing.Quality): ResolvedGlowRingQuality = when (quality) { + TangemGlowRing.Quality.Blur -> ResolvedGlowRingQuality.Blur + TangemGlowRing.Quality.LayeredStrokes -> ResolvedGlowRingQuality.LayeredStrokes + TangemGlowRing.Quality.Auto -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + ResolvedGlowRingQuality.Blur + } else { + ResolvedGlowRingQuality.LayeredStrokes + } +} + +/** Concrete rendering strategy chosen by [resolveQuality]. */ +private enum class ResolvedGlowRingQuality { Blur, LayeredStrokes } + +/** + * Builds the angular-gradient stops for [this] variant from its DS3 `colors3.glow` token group. Every + * variant token exposes the same 10 [steps] — solid arcs at steps 1/4/7, a faint arc at 9 and transparent + * gaps elsewhere — which [glowStops] lays out as evenly-spaced, seamlessly-looping stops. + */ +private fun TangemGlowRing.Variant.stops(glow: TangemColors3.Glow): List> = glowStops( + when (this) { + TangemGlowRing.Variant.Magic -> glow.magic.steps() + TangemGlowRing.Variant.Success -> glow.success.steps() + TangemGlowRing.Variant.Error -> glow.error.steps() + TangemGlowRing.Variant.Warning -> glow.warning.steps() + TangemGlowRing.Variant.Info -> glow.info.steps() + }, +) + +/** + * Blends the Magic gradients A ([magic] = `glow.magic`) and B ([magicBlend] = `glow.magicBlend`) at + * [mix] (`0` = A, `1` = B). Both token groups share the same stop positions, so the morph is a direct + * per-step color lerp. Mirrors the reference rig's auto-morph (ping-pong) between gradient A and B. + */ +private fun morphedMagicStops(magic: List, magicBlend: List, mix: Float): List> { + val m = mix.coerceIn(0f, 1f) + return glowStops(List(magic.size) { lerp(magic[it], magicBlend[it], m) }) +} + +/** + * Lays the glow [steps] out as an angular gradient: evenly spaced from `0`, with step 1 repeated at `1.0` + * so the rotation loops seamlessly. Transparent steps create the gaps between the glowing arcs. + */ +private fun glowStops(steps: List): List> { + val count = steps.size + return steps.mapIndexed { index, color -> index.toFloat() / count to color } + (1f to steps.first()) +} + +private fun TangemColors3.Glow.Magic.steps(): List = + listOf(step1, step2, step3, step4, step5, step6, step7, step8, step9, step10) + +private fun TangemColors3.Glow.MagicBlend.steps(): List = + listOf(step1, step2, step3, step4, step5, step6, step7, step8, step9, step10) + +private fun TangemColors3.Glow.Success.steps(): List = + listOf(step1, step2, step3, step4, step5, step6, step7, step8, step9, step10) + +private fun TangemColors3.Glow.Error.steps(): List = + listOf(step1, step2, step3, step4, step5, step6, step7, step8, step9, step10) + +private fun TangemColors3.Glow.Warning.steps(): List = + listOf(step1, step2, step3, step4, step5, step6, step7, step8, step9, step10) + +private fun TangemColors3.Glow.Info.steps(): List = + listOf(step1, step2, step3, step4, step5, step6, step7, step8, step9, step10) + +@Preview(name = "Light", showBackground = true) +@Preview(name = "Dark", uiMode = android.content.res.Configuration.UI_MODE_NIGHT_YES, showBackground = true) +@Composable +private fun TangemGlowRingPreview() { + TangemThemePreviewRedesign { + Column( + modifier = Modifier + .background(TangemTheme.colors3.bg.primary) + .padding(24.dp), + verticalArrangement = Arrangement.spacedBy(24.dp), + ) { + Row(horizontalArrangement = Arrangement.spacedBy(24.dp)) { + TangemGlowRing( + modifier = Modifier.size(120.dp, 72.dp), + variant = TangemGlowRing.Variant.Magic, + ) + TangemGlowRing( + modifier = Modifier.size(120.dp, 72.dp), + variant = TangemGlowRing.Variant.Success, + ) + } + Row(horizontalArrangement = Arrangement.spacedBy(24.dp)) { + TangemGlowRing( + modifier = Modifier.size(120.dp, 72.dp), + variant = TangemGlowRing.Variant.Error, + ) + TangemGlowRing( + modifier = Modifier.size(120.dp, 72.dp), + variant = TangemGlowRing.Variant.Warning, + ) + } + Row(horizontalArrangement = Arrangement.spacedBy(24.dp)) { + TangemGlowRing( + modifier = Modifier.size(120.dp, 72.dp), + variant = TangemGlowRing.Variant.Info, + ) + } + } + } +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/ds2/glowring/TangemGlowRingInternal.kt b/core/ui/src/main/java/com/tangem/core/ui/ds2/glowring/TangemGlowRingInternal.kt new file mode 100644 index 0000000000..cb4f4f1ad5 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/ds2/glowring/TangemGlowRingInternal.kt @@ -0,0 +1,231 @@ +@file:Suppress("MagicNumber") + +package com.tangem.core.ui.ds2.glowring + +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.BlurredEdgeTreatment +import androidx.compose.ui.draw.blur +import androidx.compose.ui.draw.clip +import androidx.compose.ui.geometry.CornerRadius +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Rect +import androidx.compose.ui.geometry.RoundRect +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Path +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.drawscope.DrawScope +import androidx.compose.ui.graphics.drawscope.clipPath +import androidx.compose.ui.graphics.drawscope.withTransform +import androidx.compose.ui.graphics.lerp +import androidx.compose.ui.unit.Dp +import kotlin.math.cos +import kotlin.math.max +import kotlin.math.min + +/** + * Token-driven measurements shared by both renderers, mirroring the Figma component anatomy: + * a crisp [coreWidth] core line plus two wider, blurred glow bands ([ringWidth] stroked, blurred by + * [blurMid] and [blurBottom]). + */ +internal data class GlowRingMetrics( + val coreWidth: Dp, // crisp core stroke (top layer) + val ringWidth: Dp, // glow band stroke (mid + bottom layers) + val blurMid: Dp, // mid glow blur radius + val blurBottom: Dp, // widest glow blur radius +) + +/** + * Tier 1 — works on every API level, no blur or shader. Approximates the blurred glow by stacking the + * same breathing angular-gradient ring several times: progressively wider + fainter bands under a crisp + * core. Everything is clipped to the rounded box, so only the inner half of each band shows → inner glow. + */ +@Composable +internal fun LayeredStrokesGlowRing( + angle: Float, + stops: List>, + cornerRadius: Dp, + metrics: GlowRingMetrics, + modifier: Modifier = Modifier, +) { + Box(modifier.clip(RoundedCornerShape(cornerRadius))) { + Canvas(Modifier.fillMaxSize()) { + val r = cornerRadius.toPx() + // widest & faintest first, crisp core last + drawBreathingRing( + stops = stops, + angleDeg = angle, + cornerRadiusPx = r, + strokePx = (metrics.ringWidth + metrics.blurBottom).toPx(), + alpha = 0.06f, + ) + drawBreathingRing( + stops = stops, + angleDeg = angle, + cornerRadiusPx = r, + strokePx = (metrics.ringWidth + metrics.blurMid).toPx(), + alpha = 0.12f, + ) + drawBreathingRing( + stops = stops, + angleDeg = angle, + cornerRadiusPx = r, + strokePx = metrics.ringWidth.toPx(), + alpha = 0.30f, + ) + drawBreathingRing( + stops = stops, + angleDeg = angle, + cornerRadiusPx = r, + strokePx = metrics.coreWidth.toPx(), + alpha = 1.0f, + ) + } + } +} + +/** + * Tier 2 — Android 12+ (API 31). Reproduces the Figma anatomy directly: three stacked breathing + * angular-gradient rings with real blur (bottom widest, mid, top crisp). Each layer bleeds with + * [BlurredEdgeTreatment.Unbounded]; the surrounding [clip] to the rounded box keeps only the inner + * bloom, producing the inner glow. + */ +@Composable +internal fun BlurGlowRing( + angle: Float, + stops: List>, + cornerRadius: Dp, + metrics: GlowRingMetrics, + modifier: Modifier = Modifier, +) { + Box(modifier.clip(RoundedCornerShape(cornerRadius))) { + // bottom — widest halo + BreathingRing( + angle = angle, + stops = stops, + cornerRadius = cornerRadius, + strokeWidth = metrics.ringWidth, + modifier = Modifier + .fillMaxSize() + .blur(radius = metrics.blurBottom, edgeTreatment = BlurredEdgeTreatment.Unbounded), + ) + // mid + BreathingRing( + angle = angle, + stops = stops, + cornerRadius = cornerRadius, + strokeWidth = metrics.ringWidth, + modifier = Modifier + .fillMaxSize() + .blur(radius = metrics.blurMid, edgeTreatment = BlurredEdgeTreatment.Unbounded), + ) + // top — crisp core + BreathingRing( + angle = angle, + stops = stops, + cornerRadius = cornerRadius, + strokeWidth = metrics.coreWidth, + modifier = Modifier.fillMaxSize(), + ) + } +} + +@Composable +private fun BreathingRing( + angle: Float, + stops: List>, + cornerRadius: Dp, + strokeWidth: Dp, + modifier: Modifier = Modifier, +) { + Canvas(modifier) { + drawBreathingRing( + stops = stops, + angleDeg = angle, + cornerRadiusPx = cornerRadius.toPx(), + strokePx = strokeWidth.toPx(), + alpha = 1f, + ) + } +} + +/** + * Draws one angular-gradient ring band clipped to the rounded-rect stroke outline. The gradient is a + * sweep whose colour seam is rotated by [angleDeg] (via [rotatedStops]) and whose vertical squish + * breathes between W/2 and W/8 over the rotation (`rxM = mid + amp·cos(2φ)`), reproducing the morphing + * arcs of the reference rig. + */ +private fun DrawScope.drawBreathingRing( + stops: List>, + angleDeg: Float, + cornerRadiusPx: Float, + strokePx: Float, + alpha: Float, +) { + val w = size.width + val h = size.height + if (w <= 0f || h <= 0f) return + val center = Offset(w / 2f, h / 2f) + + // Breathing horizontal radius of the gradient ellipse → vertical squish of the angle sampling. + val maxRx = w / 2f + val minRx = w / 8f + val mid = (maxRx + minRx) / 2f + val amp = max((maxRx - minRx) / 2f, 0f) + val phaseRad = Math.toRadians(angleDeg.toDouble()).toFloat() + val rxM = mid + amp * cos(2f * phaseRad) + val scaleY = h / 2f / max(rxM, 1f) + + val r = min(cornerRadiusPx, min(w, h) / 2f) + val o = strokePx / 2f + val ring = Path().apply { + fillType = PathFillType.EvenOdd + addRoundRect( + RoundRect(rect = Rect(Offset(-o, -o), Size(w + 2f * o, h + 2f * o)), cornerRadius = CornerRadius(r + o)), + ) + addRoundRect( + RoundRect( + rect = Rect(Offset(o, o), Size(w - 2f * o, h - 2f * o)), + cornerRadius = CornerRadius(max(r - o, 0f)), + ), + ) + } + + val brush = Brush.sweepGradient(colorStops = rotatedStops(stops, angleDeg), center = center) + val big = max(w, h) * 4f + clipPath(ring) { + withTransform({ scale(scaleX = 1f, scaleY = scaleY, pivot = center) }) { + drawRect( + brush = brush, + topLeft = Offset(center.x - big / 2f, center.y - big / 2f), + size = Size(big, big), + alpha = alpha, + ) + } + } +} + +/** + * Compose's [Brush.sweepGradient] has no start-angle parameter, so the colour seam is rotated by + * shifting every stop position by `deg/360` (wrapping around the loop) and re-anchoring boundary stops + * at 0 and 1 with the interpolated wrap colour. Mirrors `rotatedStops` from the reference rig. + */ +private fun rotatedStops(base: List>, deg: Float): Array> { + val d = (deg / 360f % 1f + 1f) % 1f + val uniq = base.dropLast(1) // drop the duplicate wrap stop at 1.0 + val shifted = uniq + .map { (p, c) -> ((p + d) % 1f + 1f) % 1f to c } + .sortedBy { it.first } + val first = shifted.first() + val last = shifted.last() + val span = first.first + 1f - last.first + val wrapFraction = if (span > 1e-6f) (1f - last.first) / span else 0f + val wrapColor = lerp(last.second, first.second, wrapFraction) + return (listOf(0f to wrapColor) + shifted + listOf(1f to wrapColor)).toTypedArray() +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt index d95e93902a..7ea6cfb4c7 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt @@ -190,11 +190,13 @@ object TangemTheme { @ReadOnlyComposable get() = LocalTangemTypography3.current + @Deprecated("Use plain dp") val dimens: TangemDimens @Composable @ReadOnlyComposable get() = LocalTangemDimens.current + @Deprecated("Use plain dp") val dimens2: TangemDimens2 @Composable @ReadOnlyComposable diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/.tokens-hash b/core/ui/src/main/java/com/tangem/core/ui/res/generated/.tokens-hash index 0800a2ba15..25a1abae85 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/.tokens-hash +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/.tokens-hash @@ -1 +1 @@ -7a974320353cf7ea1e0a25ca074f8e200ce44506044cc5b2bdcb00aee2c6dc85 +d90598b8786899b4dbdd8f8744c24c13ea8a9545971b0f20c1c2136be83e63be diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/TangemColors3.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/TangemColors3.kt index 12e2412528..6d46d9a9b0 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/TangemColors3.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/TangemColors3.kt @@ -19,6 +19,7 @@ class TangemColors3 internal constructor( val border: Border, val overlay: Overlay, val interaction: Interaction, + val glow: Glow, val material: Material, ) { @@ -135,6 +136,7 @@ class TangemColors3 internal constructor( orange: Color, yellow: Color, green: Color, + neutral: Color, ) { var blue by mutableStateOf(blue) private set @@ -148,6 +150,8 @@ class TangemColors3 internal constructor( private set var green by mutableStateOf(green) private set + var neutral by mutableStateOf(neutral) + private set fun update(other: Accent) { blue = other.blue @@ -156,6 +160,7 @@ class TangemColors3 internal constructor( orange = other.orange yellow = other.yellow green = other.green + neutral = other.neutral } } @@ -264,6 +269,7 @@ class TangemColors3 internal constructor( orange: Color, yellow: Color, green: Color, + neutral: Color, ) { var blue by mutableStateOf(blue) private set @@ -277,6 +283,8 @@ class TangemColors3 internal constructor( private set var green by mutableStateOf(green) private set + var neutral by mutableStateOf(neutral) + private set fun update(other: Accent) { blue = other.blue @@ -285,6 +293,7 @@ class TangemColors3 internal constructor( orange = other.orange yellow = other.yellow green = other.green + neutral = other.neutral } } @@ -361,6 +370,7 @@ class TangemColors3 internal constructor( orange: Color, yellow: Color, green: Color, + neutral: Color, ) { var blue by mutableStateOf(blue) private set @@ -374,6 +384,8 @@ class TangemColors3 internal constructor( private set var green by mutableStateOf(green) private set + var neutral by mutableStateOf(neutral) + private set fun update(other: Accent) { blue = other.blue @@ -382,6 +394,7 @@ class TangemColors3 internal constructor( orange = other.orange yellow = other.yellow green = other.green + neutral = other.neutral } } @@ -485,6 +498,7 @@ class TangemColors3 internal constructor( orange: Color, yellow: Color, green: Color, + neutral: Color, ) { var blue by mutableStateOf(blue) private set @@ -498,6 +512,8 @@ class TangemColors3 internal constructor( private set var green by mutableStateOf(green) private set + var neutral by mutableStateOf(neutral) + private set fun update(other: Accent) { blue = other.blue @@ -506,6 +522,7 @@ class TangemColors3 internal constructor( orange = other.orange yellow = other.yellow green = other.green + neutral = other.neutral } } @@ -534,28 +551,30 @@ class TangemColors3 internal constructor( @Stable class Interaction internal constructor( - pressStaticLight: Color, - pressStaticDark: Color, val press: Press, val focusRing: FocusRing, ) { - var pressStaticLight by mutableStateOf(pressStaticLight) - private set - var pressStaticDark by mutableStateOf(pressStaticDark) - private set @Stable class Press internal constructor( default: Color, + staticLight: Color, + staticDark: Color, inverse: Color, ) { var default by mutableStateOf(default) private set + var staticLight by mutableStateOf(staticLight) + private set + var staticDark by mutableStateOf(staticDark) + private set var inverse by mutableStateOf(inverse) private set fun update(other: Press) { default = other.default + staticLight = other.staticLight + staticDark = other.staticDark inverse = other.inverse } } @@ -577,13 +596,319 @@ class TangemColors3 internal constructor( } fun update(other: Interaction) { - pressStaticLight = other.pressStaticLight - pressStaticDark = other.pressStaticDark press.update(other.press) focusRing.update(other.focusRing) } } + @Stable + class Glow internal constructor( + val magic: Magic, + val magicBlend: MagicBlend, + val success: Success, + val error: Error, + val warning: Warning, + val info: Info, + ) { + + @Stable + class Magic internal constructor( + step1: Color, + step2: Color, + step3: Color, + step4: Color, + step5: Color, + step6: Color, + step7: Color, + step8: Color, + step9: Color, + step10: Color, + ) { + var step1 by mutableStateOf(step1) + private set + var step2 by mutableStateOf(step2) + private set + var step3 by mutableStateOf(step3) + private set + var step4 by mutableStateOf(step4) + private set + var step5 by mutableStateOf(step5) + private set + var step6 by mutableStateOf(step6) + private set + var step7 by mutableStateOf(step7) + private set + var step8 by mutableStateOf(step8) + private set + var step9 by mutableStateOf(step9) + private set + var step10 by mutableStateOf(step10) + private set + + fun update(other: Magic) { + step1 = other.step1 + step2 = other.step2 + step3 = other.step3 + step4 = other.step4 + step5 = other.step5 + step6 = other.step6 + step7 = other.step7 + step8 = other.step8 + step9 = other.step9 + step10 = other.step10 + } + } + + @Stable + class MagicBlend internal constructor( + step1: Color, + step2: Color, + step3: Color, + step4: Color, + step5: Color, + step6: Color, + step7: Color, + step8: Color, + step9: Color, + step10: Color, + ) { + var step1 by mutableStateOf(step1) + private set + var step2 by mutableStateOf(step2) + private set + var step3 by mutableStateOf(step3) + private set + var step4 by mutableStateOf(step4) + private set + var step5 by mutableStateOf(step5) + private set + var step6 by mutableStateOf(step6) + private set + var step7 by mutableStateOf(step7) + private set + var step8 by mutableStateOf(step8) + private set + var step9 by mutableStateOf(step9) + private set + var step10 by mutableStateOf(step10) + private set + + fun update(other: MagicBlend) { + step1 = other.step1 + step2 = other.step2 + step3 = other.step3 + step4 = other.step4 + step5 = other.step5 + step6 = other.step6 + step7 = other.step7 + step8 = other.step8 + step9 = other.step9 + step10 = other.step10 + } + } + + @Stable + class Success internal constructor( + step1: Color, + step2: Color, + step3: Color, + step4: Color, + step5: Color, + step6: Color, + step7: Color, + step8: Color, + step9: Color, + step10: Color, + ) { + var step1 by mutableStateOf(step1) + private set + var step2 by mutableStateOf(step2) + private set + var step3 by mutableStateOf(step3) + private set + var step4 by mutableStateOf(step4) + private set + var step5 by mutableStateOf(step5) + private set + var step6 by mutableStateOf(step6) + private set + var step7 by mutableStateOf(step7) + private set + var step8 by mutableStateOf(step8) + private set + var step9 by mutableStateOf(step9) + private set + var step10 by mutableStateOf(step10) + private set + + fun update(other: Success) { + step1 = other.step1 + step2 = other.step2 + step3 = other.step3 + step4 = other.step4 + step5 = other.step5 + step6 = other.step6 + step7 = other.step7 + step8 = other.step8 + step9 = other.step9 + step10 = other.step10 + } + } + + @Stable + class Error internal constructor( + step1: Color, + step2: Color, + step3: Color, + step4: Color, + step5: Color, + step6: Color, + step7: Color, + step8: Color, + step9: Color, + step10: Color, + ) { + var step1 by mutableStateOf(step1) + private set + var step2 by mutableStateOf(step2) + private set + var step3 by mutableStateOf(step3) + private set + var step4 by mutableStateOf(step4) + private set + var step5 by mutableStateOf(step5) + private set + var step6 by mutableStateOf(step6) + private set + var step7 by mutableStateOf(step7) + private set + var step8 by mutableStateOf(step8) + private set + var step9 by mutableStateOf(step9) + private set + var step10 by mutableStateOf(step10) + private set + + fun update(other: Error) { + step1 = other.step1 + step2 = other.step2 + step3 = other.step3 + step4 = other.step4 + step5 = other.step5 + step6 = other.step6 + step7 = other.step7 + step8 = other.step8 + step9 = other.step9 + step10 = other.step10 + } + } + + @Stable + class Warning internal constructor( + step1: Color, + step2: Color, + step3: Color, + step4: Color, + step5: Color, + step6: Color, + step7: Color, + step8: Color, + step9: Color, + step10: Color, + ) { + var step1 by mutableStateOf(step1) + private set + var step2 by mutableStateOf(step2) + private set + var step3 by mutableStateOf(step3) + private set + var step4 by mutableStateOf(step4) + private set + var step5 by mutableStateOf(step5) + private set + var step6 by mutableStateOf(step6) + private set + var step7 by mutableStateOf(step7) + private set + var step8 by mutableStateOf(step8) + private set + var step9 by mutableStateOf(step9) + private set + var step10 by mutableStateOf(step10) + private set + + fun update(other: Warning) { + step1 = other.step1 + step2 = other.step2 + step3 = other.step3 + step4 = other.step4 + step5 = other.step5 + step6 = other.step6 + step7 = other.step7 + step8 = other.step8 + step9 = other.step9 + step10 = other.step10 + } + } + + @Stable + class Info internal constructor( + step1: Color, + step2: Color, + step3: Color, + step4: Color, + step5: Color, + step6: Color, + step7: Color, + step8: Color, + step9: Color, + step10: Color, + ) { + var step1 by mutableStateOf(step1) + private set + var step2 by mutableStateOf(step2) + private set + var step3 by mutableStateOf(step3) + private set + var step4 by mutableStateOf(step4) + private set + var step5 by mutableStateOf(step5) + private set + var step6 by mutableStateOf(step6) + private set + var step7 by mutableStateOf(step7) + private set + var step8 by mutableStateOf(step8) + private set + var step9 by mutableStateOf(step9) + private set + var step10 by mutableStateOf(step10) + private set + + fun update(other: Info) { + step1 = other.step1 + step2 = other.step2 + step3 = other.step3 + step4 = other.step4 + step5 = other.step5 + step6 = other.step6 + step7 = other.step7 + step8 = other.step8 + step9 = other.step9 + step10 = other.step10 + } + } + + fun update(other: Glow) { + magic.update(other.magic) + magicBlend.update(other.magicBlend) + success.update(other.success) + error.update(other.error) + warning.update(other.warning) + info.update(other.info) + } + } + @Stable class Material internal constructor( val tint: Tint, @@ -709,6 +1034,7 @@ class TangemColors3 internal constructor( border.update(other.border) overlay.update(other.overlay) interaction.update(other.interaction) + glow.update(other.glow) material.update(other.material) } } \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/TangemColors3Dark.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/TangemColors3Dark.kt index a2fa0d535e..461fd9f863 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/TangemColors3Dark.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/TangemColors3Dark.kt @@ -43,6 +43,7 @@ internal fun darkColors3() = orange = TangemColorPalette.Orange.`40`, yellow = TangemColorPalette.Yellow.`40`, green = TangemColorPalette.Green.`40`, + neutral = TangemColorPalette.Neutral.`40`, ), ), bg = TangemColors3.Bg( @@ -74,6 +75,7 @@ internal fun darkColors3() = orange = TangemColorPalette.Orange.`50`, yellow = TangemColorPalette.Yellow.`50`, green = TangemColorPalette.Green.`50`, + neutral = TangemColorPalette.Neutral.`50`, ), ), icon = TangemColors3.Icon( @@ -97,6 +99,7 @@ internal fun darkColors3() = orange = TangemColorPalette.Orange.`40`, yellow = TangemColorPalette.Yellow.`40`, green = TangemColorPalette.Green.`40`, + neutral = TangemColorPalette.Neutral.`40`, ), ), border = TangemColors3.Border( @@ -126,16 +129,17 @@ internal fun darkColors3() = orange = TangemColorPalette.Orange.`40`, yellow = TangemColorPalette.Yellow.`40`, green = TangemColorPalette.Green.`40`, + neutral = TangemColorPalette.Neutral.`40`, ), ), overlay = TangemColors3.Overlay( modal = TangemColorPalette.Opaque.BaseBlack.`80`, ), interaction = TangemColors3.Interaction( - pressStaticLight = TangemColorPalette.Opaque.BaseBlack.`10`, - pressStaticDark = TangemColorPalette.Opaque.BaseWhite.`10`, press = TangemColors3.Interaction.Press( default = TangemColorPalette.Opaque.BaseWhite.`10`, + staticLight = TangemColorPalette.Opaque.BaseBlack.`10`, + staticDark = TangemColorPalette.Opaque.BaseWhite.`10`, inverse = TangemColorPalette.Opaque.BaseBlack.`10`, ), focusRing = TangemColors3.Interaction.FocusRing( @@ -143,6 +147,80 @@ internal fun darkColors3() = brand = TangemColorPalette.Blue.`50`, ), ), + glow = TangemColors3.Glow( + magic = TangemColors3.Glow.Magic( + step1 = TangemColorPalette.Yellow.`30`, + step2 = Color(0x000077E1), + step3 = Color(0x000C58AF), + step4 = TangemColorPalette.Blue.`50`, + step5 = Color(0x005EBDF9), + step6 = Color(0x00473068), + step7 = TangemColorPalette.Violet.`50`, + step8 = Color(0x00E12C2E), + step9 = Color(0x4D473068), + step10 = Color(0x0067419B), + ), + magicBlend = TangemColors3.Glow.MagicBlend( + step1 = TangemColorPalette.Violet.`50`, + step2 = Color(0x00143C70), + step3 = Color(0x00FA6931), + step4 = TangemColorPalette.Yellow.`30`, + step5 = Color(0x002DAE3B), + step6 = Color(0x0098D7FF), + step7 = TangemColorPalette.Green.`20`, + step8 = Color(0x00A967FD), + step9 = Color(0x4D67419B), + step10 = Color(0x00FF5E66), + ), + success = TangemColors3.Glow.Success( + step1 = TangemColorPalette.Green.`50`, + step2 = Color(0x001C4415), + step3 = Color(0x001C4415), + step4 = TangemColorPalette.Green.`60`, + step5 = Color(0x001C4415), + step6 = Color(0x001C4415), + step7 = TangemColorPalette.Green.`40`, + step8 = Color(0x001C4415), + step9 = Color(0x4D1C4415), + step10 = Color(0x001C4415), + ), + error = TangemColors3.Glow.Error( + step1 = TangemColorPalette.Red.`50`, + step2 = Color(0x006D2323), + step3 = Color(0x006D2323), + step4 = TangemColorPalette.Red.`60`, + step5 = Color(0x006D2323), + step6 = Color(0x006D2323), + step7 = TangemColorPalette.Red.`40`, + step8 = Color(0x006D2323), + step9 = Color(0x4D6D2323), + step10 = Color(0x006D2323), + ), + warning = TangemColors3.Glow.Warning( + step1 = TangemColorPalette.Yellow.`40`, + step2 = Color(0x00573414), + step3 = Color(0x00573414), + step4 = TangemColorPalette.Yellow.`50`, + step5 = Color(0x00573414), + step6 = Color(0x00573414), + step7 = TangemColorPalette.Yellow.`30`, + step8 = Color(0x00573414), + step9 = Color(0x4D573414), + step10 = Color(0x00573414), + ), + info = TangemColors3.Glow.Info( + step1 = TangemColorPalette.Blue.`50`, + step2 = Color(0x00143C70), + step3 = Color(0x00143C70), + step4 = TangemColorPalette.Blue.`60`, + step5 = Color(0x00143C70), + step6 = Color(0x00143C70), + step7 = TangemColorPalette.Blue.`40`, + step8 = Color(0x00143C70), + step9 = Color(0x4D143C70), + step10 = Color(0x00143C70), + ), + ), material = TangemColors3.Material( tint = TangemColors3.Material.Tint( glass = Color(0x662C2C2C), diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/TangemColors3Light.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/TangemColors3Light.kt index b52a4e4221..2e19348749 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/TangemColors3Light.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/TangemColors3Light.kt @@ -43,6 +43,7 @@ internal fun lightColors3() = orange = TangemColorPalette.Orange.`50`, yellow = TangemColorPalette.Yellow.`50`, green = TangemColorPalette.Green.`50`, + neutral = TangemColorPalette.Neutral.`50`, ), ), bg = TangemColors3.Bg( @@ -74,6 +75,7 @@ internal fun lightColors3() = orange = TangemColorPalette.Orange.`50`, yellow = TangemColorPalette.Yellow.`50`, green = TangemColorPalette.Green.`50`, + neutral = TangemColorPalette.Neutral.`50`, ), ), icon = TangemColors3.Icon( @@ -97,6 +99,7 @@ internal fun lightColors3() = orange = TangemColorPalette.Orange.`50`, yellow = TangemColorPalette.Yellow.`50`, green = TangemColorPalette.Green.`50`, + neutral = TangemColorPalette.Neutral.`50`, ), ), border = TangemColors3.Border( @@ -126,16 +129,17 @@ internal fun lightColors3() = orange = TangemColorPalette.Orange.`50`, yellow = TangemColorPalette.Yellow.`50`, green = TangemColorPalette.Green.`50`, + neutral = TangemColorPalette.Neutral.`50`, ), ), overlay = TangemColors3.Overlay( modal = TangemColorPalette.Opaque.BaseBlack.`60`, ), interaction = TangemColors3.Interaction( - pressStaticLight = TangemColorPalette.Opaque.BaseBlack.`10`, - pressStaticDark = TangemColorPalette.Opaque.BaseWhite.`10`, press = TangemColors3.Interaction.Press( default = TangemColorPalette.Opaque.BaseBlack.`10`, + staticLight = TangemColorPalette.Opaque.BaseBlack.`10`, + staticDark = TangemColorPalette.Opaque.BaseWhite.`10`, inverse = TangemColorPalette.Opaque.BaseWhite.`10`, ), focusRing = TangemColors3.Interaction.FocusRing( @@ -143,6 +147,80 @@ internal fun lightColors3() = brand = TangemColorPalette.Blue.`50`, ), ), + glow = TangemColors3.Glow( + magic = TangemColors3.Glow.Magic( + step1 = TangemColorPalette.Yellow.`30`, + step2 = Color(0x00DBF1FF), + step3 = Color(0x00109FF0), + step4 = TangemColorPalette.Blue.`40`, + step5 = Color(0x00DBF1FF), + step6 = Color(0x00C5A5FC), + step7 = TangemColorPalette.Violet.`40`, + step8 = Color(0x00FF979D), + step9 = Color(0x4DC5A5FC), + step10 = Color(0x00EEE7FD), + ), + magicBlend = TangemColors3.Glow.MagicBlend( + step1 = TangemColorPalette.Violet.`40`, + step2 = Color(0x0098D7FF), + step3 = Color(0x00FFC3AD), + step4 = TangemColorPalette.Yellow.`30`, + step5 = Color(0x009EE1AB), + step6 = Color(0x00109FF0), + step7 = TangemColorPalette.Green.`30`, + step8 = Color(0x00B07BFD), + step9 = Color(0x4DC5A5FC), + step10 = Color(0x00FF979D), + ), + success = TangemColors3.Glow.Success( + step1 = TangemColorPalette.Green.`40`, + step2 = Color(0x009EE1AB), + step3 = Color(0x009EE1AB), + step4 = TangemColorPalette.Green.`50`, + step5 = Color(0x009EE1AB), + step6 = Color(0x009EE1AB), + step7 = TangemColorPalette.Green.`30`, + step8 = Color(0x009EE1AB), + step9 = Color(0x4D9EE1AB), + step10 = Color(0x009EE1AB), + ), + error = TangemColors3.Glow.Error( + step1 = TangemColorPalette.Red.`40`, + step2 = Color(0x00FFC0C3), + step3 = Color(0x00FFC0C3), + step4 = TangemColorPalette.Red.`50`, + step5 = Color(0x00FFC0C3), + step6 = Color(0x00FFC0C3), + step7 = TangemColorPalette.Red.`30`, + step8 = Color(0x00FFC0C3), + step9 = Color(0x4DFFC0C3), + step10 = Color(0x00FFC0C3), + ), + warning = TangemColors3.Glow.Warning( + step1 = TangemColorPalette.Yellow.`30`, + step2 = Color(0x00F7CA75), + step3 = Color(0x00F7CA75), + step4 = TangemColorPalette.Yellow.`40`, + step5 = Color(0x00F7CA75), + step6 = Color(0x00F7CA75), + step7 = TangemColorPalette.Yellow.`20`, + step8 = Color(0x00F7CA75), + step9 = Color(0x4DF7CA75), + step10 = Color(0x00F7CA75), + ), + info = TangemColors3.Glow.Info( + step1 = TangemColorPalette.Blue.`40`, + step2 = Color(0x0098D7FF), + step3 = Color(0x0098D7FF), + step4 = TangemColorPalette.Blue.`50`, + step5 = Color(0x0098D7FF), + step6 = Color(0x0098D7FF), + step7 = TangemColorPalette.Blue.`30`, + step8 = Color(0x0098D7FF), + step9 = Color(0x4D98D7FF), + step10 = Color(0x0098D7FF), + ), + ), material = TangemColors3.Material( tint = TangemColors3.Material.Tint( glass = Color(0x00000000), diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/TangemTypography3.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/TangemTypography3.kt index 82f5ccf04b..d26159f053 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/TangemTypography3.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/TangemTypography3.kt @@ -43,7 +43,7 @@ class TangemTypography3 internal constructor(fontFamily: FontFamily) { fontFamily = fontFamily, fontWeight = FontWeight.SemiBold, fontSize = 28.sp, - lineHeight = 33.sp, + lineHeight = 34.sp, letterSpacing = (-0.37).sp, lineHeightStyle = LineHeightStyle( alignment = LineHeightStyle.Alignment.Center, diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/.icons-hash b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/.icons-hash index f8f420442f..d528c86c9e 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/.icons-hash +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/.icons-hash @@ -1 +1 @@ -f264a99d653eca57bedd4b49ff9ce5171ba9615770a57d574824e387f6cb1d5c +023a0f2a00de6fcd99f046ded7f648786a000cf1b10b70e17c78b1efed9e63f6 diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcAddressPolygon16.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcAddressPolygon16.kt index 0f45533d70..153362ca79 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcAddressPolygon16.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcAddressPolygon16.kt @@ -31,7 +31,7 @@ val Icons.ic_address_polygon_16: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M4.53711 2.69414C5.02195 2.43596 5.60404 2.43592 6.08887 2.69414L7.75195 3.57988C8.28964 3.86657 8.62591 4.42656 8.62598 5.03594V5.49492C8.62547 5.83958 8.34573 6.11979 8.00098 6.11992C7.65613 6.1199 7.37649 5.83965 7.37598 5.49492V5.03594C7.37591 4.88841 7.29414 4.75294 7.16406 4.6834L5.50098 3.79766C5.38347 3.73507 5.24252 3.73512 5.125 3.79766L3.46191 4.6834C3.3317 4.7529 3.25007 4.88833 3.25 5.03594V7.38457C3.2502 7.53207 3.33176 7.66767 3.46191 7.73711L5.125 8.62285C5.24241 8.68521 5.3836 8.6853 5.50098 8.62285L9.91309 6.27324C10.3979 6.01506 10.98 6.01502 11.4648 6.27324L13.1279 7.15898C13.6656 7.44565 14.0019 8.00568 14.002 8.61504V10.9637C14.0018 11.573 13.6656 12.1331 13.1279 12.4197L11.4648 13.3055C10.9801 13.5636 10.3978 13.5635 9.91309 13.3055L8.25 12.4197C7.71226 12.1331 7.37617 11.573 7.37598 10.9637V10.5057C7.37598 10.1605 7.65581 9.88068 8.00098 9.88066C8.34604 9.88079 8.62598 10.1606 8.62598 10.5057V10.9637C8.62617 11.1113 8.70759 11.2478 8.83789 11.3172L10.501 12.2029C10.6183 12.2652 10.7597 12.2652 10.877 12.2029L12.54 11.3172C12.6703 11.2478 12.7518 11.1112 12.752 10.9637V8.61504C12.7519 8.46752 12.6701 8.33202 12.54 8.2625L10.877 7.37676C10.7595 7.31417 10.6185 7.31422 10.501 7.37676L6.08887 9.72637C5.60417 9.98446 5.02184 9.98437 4.53711 9.72637L2.87402 8.84062C2.33626 8.55404 2.0002 7.99392 2 7.38457V5.03594C2.00007 4.42648 2.3362 3.86654 2.87402 3.57988L4.53711 2.69414Z"), + pathData = addPathNodes("M4.53711 2.69414C5.02195 2.43596 5.60404 2.43592 6.08887 2.69414L7.75195 3.57988C8.28964 3.86657 8.62591 4.42656 8.62598 5.03594V5.49492C8.62547 5.83958 8.34573 6.11979 8.00098 6.11992C7.65613 6.1199 7.37649 5.83965 7.37598 5.49492V5.03594C7.37591 4.88841 7.29414 4.75294 7.16406 4.6834L5.50098 3.79766C5.38347 3.73507 5.24252 3.73512 5.125 3.79766L3.46191 4.6834C3.3317 4.7529 3.25007 4.88833 3.25 5.03594V7.38457C3.2502 7.53207 3.33176 7.66767 3.46191 7.73711L5.125 8.62285C5.24241 8.68521 5.3836 8.6853 5.50098 8.62285L9.91309 6.27324C10.3979 6.01506 10.98 6.01502 11.4648 6.27324L13.1279 7.15898C13.6656 7.44565 14.0019 8.00567 14.002 8.61504V10.9637C14.0018 11.573 13.6656 12.1331 13.1279 12.4197L11.4648 13.3055C10.9801 13.5636 10.3978 13.5635 9.91309 13.3055L8.25 12.4197C7.71226 12.1331 7.37617 11.573 7.37598 10.9637V10.5057C7.37598 10.1605 7.65581 9.88068 8.00098 9.88066C8.34604 9.8808 8.62598 10.1606 8.62598 10.5057V10.9637C8.62617 11.1113 8.70759 11.2478 8.83789 11.3172L10.501 12.2029C10.6183 12.2652 10.7597 12.2652 10.877 12.2029L12.54 11.3172C12.6703 11.2478 12.7518 11.1112 12.752 10.9637V8.61504C12.7519 8.46752 12.6701 8.33202 12.54 8.2625L10.877 7.37676C10.7595 7.31417 10.6185 7.31422 10.501 7.37676L6.08887 9.72637C5.60417 9.98446 5.02184 9.98437 4.53711 9.72637L2.87402 8.84062C2.33626 8.55404 2.0002 7.99392 2 7.38457V5.03594C2.00007 4.42648 2.3362 3.86654 2.87402 3.57988L4.53711 2.69414Z"), ) }.build() return _ic_address_polygon_16!! diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcAddressPolygon20.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcAddressPolygon20.kt index 9f2ef9e32b..c6f1f61ade 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcAddressPolygon20.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcAddressPolygon20.kt @@ -31,7 +31,7 @@ val Icons.ic_address_polygon_20: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M5.78125 3.21402C6.30813 2.92909 6.94286 2.92905 7.46973 3.21402L9.82031 4.48453C10.3935 4.79465 10.751 5.39437 10.751 6.04605V6.80484C10.7504 7.21849 10.4147 7.55467 10.001 7.55484C9.5871 7.55484 9.25152 7.21859 9.25098 6.80484V6.04605C9.25095 5.94518 9.19511 5.85194 9.10645 5.80386L6.75586 4.53335C6.67424 4.48924 6.57575 4.48921 6.49414 4.53335L4.14453 5.80386C4.05587 5.85194 4.00002 5.94518 4 6.04605V9.38882C4.00037 9.48941 4.056 9.58215 4.14453 9.63003L6.49414 10.9015C6.57557 10.9455 6.6744 10.9454 6.75586 10.9015L12.5312 7.7775C13.0582 7.4925 13.6938 7.4925 14.2207 7.7775L16.5703 9.04898C17.1435 9.35911 17.501 9.9588 17.501 10.6105V13.9523C17.5008 14.6039 17.1434 15.2038 16.5703 15.5138L14.2207 16.7853C13.6939 17.0701 13.058 17.0701 12.5312 16.7853L10.1816 15.5138C9.6085 15.2038 9.25119 14.6039 9.25098 13.9523V13.1945C9.25098 12.7803 9.58676 12.4445 10.001 12.4445C10.415 12.4447 10.751 12.7804 10.751 13.1945V13.9523C10.7512 14.053 10.806 14.1465 10.8945 14.1945L13.2451 15.466C13.3266 15.5099 13.4254 15.5099 13.5068 15.466L15.8574 14.1945C15.946 14.1465 16.0008 14.053 16.001 13.9523V10.6105C16.001 10.5097 15.946 10.4164 15.8574 10.3683L13.5068 9.09683C13.4253 9.05275 13.3267 9.05274 13.2451 9.09683L7.46973 12.2209C6.94305 12.5056 6.30796 12.5055 5.78125 12.2209L3.43066 10.9494C2.85767 10.6394 2.50037 10.0402 2.5 9.38882V6.04605C2.50002 5.39437 2.85752 4.79465 3.43066 4.48453L5.78125 3.21402Z"), + pathData = addPathNodes("M5.78125 3.21402C6.30813 2.92909 6.94286 2.92905 7.46973 3.21402L9.82031 4.48453C10.3935 4.79465 10.751 5.39437 10.751 6.04605V6.80484C10.7504 7.21849 10.4147 7.55467 10.001 7.55484C9.5871 7.55484 9.25152 7.21859 9.25098 6.80484V6.04605C9.25095 5.94518 9.19511 5.85194 9.10645 5.80386L6.75586 4.53335C6.67424 4.48924 6.57575 4.48921 6.49414 4.53335L4.14453 5.80386C4.05587 5.85194 4.00002 5.94518 4 6.04605V9.38882C4.00037 9.48941 4.05601 9.58215 4.14453 9.63003L6.49414 10.9015C6.57557 10.9455 6.6744 10.9454 6.75586 10.9015L12.5312 7.7775C13.0582 7.4925 13.6938 7.4925 14.2207 7.7775L16.5703 9.04898C17.1435 9.35911 17.501 9.9588 17.501 10.6105V13.9523C17.5008 14.6039 17.1434 15.2038 16.5703 15.5138L14.2207 16.7853C13.6939 17.0701 13.058 17.0701 12.5312 16.7853L10.1816 15.5138C9.6085 15.2038 9.25119 14.6039 9.25098 13.9523V13.1945C9.25098 12.7803 9.58676 12.4445 10.001 12.4445C10.415 12.4447 10.751 12.7804 10.751 13.1945V13.9523C10.7512 14.053 10.806 14.1465 10.8945 14.1945L13.2451 15.466C13.3266 15.5099 13.4254 15.5099 13.5068 15.466L15.8574 14.1945C15.946 14.1465 16.0008 14.053 16.001 13.9523V10.6105C16.001 10.5097 15.946 10.4164 15.8574 10.3683L13.5068 9.09683C13.4253 9.05275 13.3267 9.05274 13.2451 9.09683L7.46973 12.2209C6.94305 12.5056 6.30796 12.5055 5.78125 12.2209L3.43066 10.9494C2.85767 10.6394 2.50037 10.0402 2.5 9.38882V6.04605C2.50002 5.39437 2.85752 4.79465 3.43066 4.48453L5.78125 3.21402Z"), ) }.build() return _ic_address_polygon_20!! diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcArrowRefresh12.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcArrowRefresh12.kt index 4b96effc22..727cee5a88 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcArrowRefresh12.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcArrowRefresh12.kt @@ -31,7 +31,7 @@ val Icons.ic_arrow_refresh_12: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M9.96777 5.4668C10.2623 5.4668 10.501 5.70545 10.501 6C10.501 8.48579 8.48581 10.501 6 10.501C4.62026 10.5007 3.39017 9.87706 2.56641 8.90039V9.30664C2.56606 9.6009 2.32754 9.83984 2.0332 9.83984C1.73913 9.83953 1.50035 9.6007 1.5 9.30664V7.65332C1.5 7.35896 1.73892 7.12043 2.0332 7.12012H3.68652C3.98107 7.12012 4.21973 7.35877 4.21973 7.65332C4.21954 7.94772 3.98096 8.18652 3.68652 8.18652H3.35938C3.98887 8.94784 4.93716 9.43331 6 9.43359C7.89672 9.43359 9.43457 7.89668 9.43457 6C9.43457 5.7056 9.67343 5.46705 9.96777 5.4668Z"), + pathData = addPathNodes("M9.96777 5.4668C10.2623 5.4668 10.501 5.70545 10.501 6C10.501 8.48579 8.48581 10.501 6 10.501C4.62026 10.5007 3.39017 9.87706 2.56641 8.90039V9.30664C2.56606 9.6009 2.32754 9.83984 2.0332 9.83984C1.73913 9.83953 1.50035 9.6007 1.5 9.30664V7.65332C1.5 7.35896 1.73892 7.12043 2.0332 7.12012H3.68652C3.98107 7.12012 4.21973 7.35877 4.21973 7.65332C4.21954 7.94772 3.98096 8.18652 3.68652 8.18652H3.35938C3.98887 8.94784 4.93716 9.43331 6 9.43359C7.89672 9.43359 9.43457 7.89668 9.43457 6C9.43457 5.7056 9.67344 5.46705 9.96777 5.4668Z"), ) addPath( fill = SolidColor(Color.Black), diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcArrowRefresh16.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcArrowRefresh16.kt index d50ac44c1e..9632567b09 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcArrowRefresh16.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcArrowRefresh16.kt @@ -31,7 +31,7 @@ val Icons.ic_arrow_refresh_16: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M12.8789 7.37695C13.224 7.37704 13.5039 7.65683 13.5039 8.00195C13.5039 11.0407 11.0407 13.5038 8.00195 13.5039C6.28439 13.5039 4.7571 12.713 3.75 11.4814V12.0664C3.74971 12.4113 3.46988 12.6913 3.125 12.6914C2.7801 12.6913 2.50029 12.4113 2.5 12.0664V10.0342C2.5 9.68908 2.77992 9.4093 3.125 9.40918H5.15723C5.50229 9.40932 5.78223 9.68909 5.78223 10.0342C5.78207 10.3791 5.50219 10.659 5.15723 10.6592H4.69141C5.47041 11.6307 6.66264 12.2539 8.00195 12.2539C10.3503 12.2538 12.2539 10.3503 12.2539 8.00195C12.2539 7.65678 12.5337 7.37695 12.8789 7.37695Z"), + pathData = addPathNodes("M12.8789 7.37695C13.224 7.37704 13.5039 7.65683 13.5039 8.00195C13.5039 11.0407 11.0407 13.5038 8.00195 13.5039C6.28439 13.5039 4.7571 12.713 3.75 11.4814V12.0664C3.74971 12.4113 3.46988 12.6913 3.125 12.6914C2.7801 12.6913 2.50029 12.4113 2.5 12.0664V10.0342C2.5 9.68907 2.77992 9.4093 3.125 9.40918H5.15723C5.50229 9.40932 5.78223 9.68909 5.78223 10.0342C5.78207 10.3791 5.50219 10.659 5.15723 10.6592H4.69141C5.47041 11.6307 6.66264 12.2539 8.00195 12.2539C10.3503 12.2538 12.2539 10.3503 12.2539 8.00195C12.2539 7.65677 12.5337 7.37695 12.8789 7.37695Z"), ) addPath( fill = SolidColor(Color.Black), diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcArrowRefresh28.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcArrowRefresh28.kt new file mode 100644 index 0000000000..bc6d7de29b --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcArrowRefresh28.kt @@ -0,0 +1,52 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_arrow_refresh_28: ImageVector? = null + +val Icons.ic_arrow_refresh_28: ImageVector + get() { + if (_ic_arrow_refresh_28 != null) return _ic_arrow_refresh_28!! + _ic_arrow_refresh_28 = ImageVector.Builder( + name = "ic_arrow_refresh_28", + defaultWidth = 28.dp, + defaultHeight = 28.dp, + viewportWidth = 28f, + viewportHeight = 28f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M24.751 12.749C24.0606 12.749 23.501 13.3087 23.501 13.999C23.501 19.2457 19.248 23.4978 14.001 23.498C10.9116 23.498 8.16877 22.0188 6.43457 19.7275H7.72949C8.41975 19.7274 8.97949 19.1678 8.97949 18.4775C8.9793 17.7874 8.41963 17.2277 7.72949 17.2275H3.25C2.55993 17.2277 2.00019 17.7875 2 18.4775V22.9561C2 23.6463 2.55981 24.2059 3.25 24.2061C3.94026 24.2059 4.5 23.6463 4.5 22.9561V21.3115C6.69035 24.1575 10.1264 25.998 14.001 25.998C20.6286 25.9978 26.001 20.6265 26.001 13.999C26.001 13.3088 25.4412 12.7492 24.751 12.749Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M14 2C7.37245 2.0002 2.00018 7.37166 2 13.999C2.00013 14.6891 2.55994 15.2488 3.25 15.249C3.94022 15.249 4.49987 14.6892 4.5 13.999C4.50018 8.75249 8.75304 4.5002 14 4.5C17.0888 4.50004 19.8312 5.97872 21.5654 8.26953H20.2715C19.5815 8.26973 19.0218 8.82959 19.0215 9.51953C19.0215 10.2098 19.5813 10.7693 20.2715 10.7695H24.751C25.4412 10.7693 26.001 10.2098 26.001 9.51953V5.04102C26.0008 4.35091 25.4411 3.79122 24.751 3.79102C24.0607 3.79102 23.5011 4.35078 23.501 5.04102V6.6875C21.3106 3.84097 17.8749 2.00004 14 2Z"), + ) + }.build() + return _ic_arrow_refresh_28!! + } + +@Composable +@Preview(showBackground = true) +private fun IcArrowRefresh28Preview() { + Icon( + imageVector = Icons.ic_arrow_refresh_28, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcBinoculars28.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcBinoculars28.kt new file mode 100644 index 0000000000..6bf84da21b --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcBinoculars28.kt @@ -0,0 +1,47 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_binoculars_28: ImageVector? = null + +val Icons.ic_binoculars_28: ImageVector + get() { + if (_ic_binoculars_28 != null) return _ic_binoculars_28!! + _ic_binoculars_28 = ImageVector.Builder( + name = "ic_binoculars_28", + defaultWidth = 28.dp, + defaultHeight = 28.dp, + viewportWidth = 28f, + viewportHeight = 28f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M19.7578 5.00391C21.6512 5.08382 23.2755 6.39977 23.751 8.24805L25.7334 15.9453C25.9024 16.4714 25.9951 17.028 25.9951 17.5996C25.995 19.7768 24.6902 21.7452 22.6816 22.5811C20.6717 23.4172 18.3597 22.9512 16.8262 21.4053C15.9614 20.5334 15.4557 19.438 15.3076 18.3047H12.6846C12.6248 18.7649 12.509 19.2228 12.3272 19.665C11.499 21.679 9.54216 22.9979 7.36622 22.998C5.19023 22.998 3.23354 21.679 2.40528 19.665C1.95365 18.5664 1.8872 17.377 2.16797 16.2725L2.18067 16.2168C2.18644 16.1951 2.19123 16.173 2.19727 16.1514L4.23438 8.24902C4.72469 6.34088 6.43972 5.00092 8.41114 5.00098C10.4237 5.00098 12.1068 6.38144 12.5879 8.24219H15.3984C15.8795 6.38135 17.5618 5.00015 19.5742 5L19.7578 5.00391ZM9.38868 15.5566C8.27017 14.4341 6.46227 14.4341 5.34376 15.5566C4.52086 16.3827 4.27211 17.6296 4.71778 18.7139C5.1632 19.7968 6.21056 20.498 7.36622 20.498C8.52184 20.4979 9.5693 19.7969 10.0147 18.7139C10.1716 18.3321 10.2405 17.9298 10.2305 17.5332H10.2256V17.4111C10.1795 16.7245 9.89192 16.0619 9.38868 15.5566ZM21.7207 14.9268C20.6517 14.4821 19.4204 14.7281 18.6006 15.5547C17.4807 16.684 17.4808 18.5152 18.6006 19.6445C19.4204 20.4709 20.6518 20.7179 21.7207 20.2734C22.7909 19.8282 23.495 18.774 23.4951 17.5996C23.4951 17.3576 23.4631 17.121 23.4063 16.8936L23.3975 16.8965L23.334 16.6504C23.0688 15.8823 22.4904 15.2471 21.7207 14.9268ZM12.7256 10.7422V15.8047H15.2598V10.7422H12.7256ZM8.41114 7.5C7.59 7.49995 6.86494 8.05939 6.65626 8.87109L5.72852 12.4717C7.21662 11.9941 8.87032 12.1841 10.2256 13.043V9.33301C10.2254 8.31386 9.40615 7.5 8.41114 7.5ZM19.5742 7.5C18.5794 7.50017 17.7599 8.31397 17.7598 9.33301V13.041C19.0875 12.1979 20.7338 11.9753 22.2549 12.4619L21.3301 8.87207C21.1214 8.06026 20.3955 7.49981 19.5742 7.5Z"), + ) + }.build() + return _ic_binoculars_28!! + } + +@Composable +@Preview(showBackground = true) +private fun IcBinoculars28Preview() { + Icon( + imageVector = Icons.ic_binoculars_28, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcCheckmark24.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcCheckmark24.kt index 035dd8cb2a..dd2db530bc 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcCheckmark24.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcCheckmark24.kt @@ -31,7 +31,7 @@ val Icons.ic_checkmark_24: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M18.2784 6.30768C18.6608 5.90939 19.294 5.89615 19.6924 6.27839C20.0907 6.66081 20.104 7.29407 19.7217 7.69245L10.1202 17.6924C9.93164 17.8888 9.67073 18 9.3985 18.0001C9.12637 18 8.86632 17.8887 8.6778 17.6924L4.27838 13.1124C3.89612 12.714 3.90943 12.0808 4.30768 11.6983C4.70604 11.3161 5.33929 11.3294 5.72174 11.7276L9.39752 15.5557L18.2784 6.30768Z"), + pathData = addPathNodes("M18.2784 6.30768C18.6608 5.90939 19.294 5.89615 19.6924 6.27839C20.0907 6.66081 20.104 7.29407 19.7217 7.69245L10.1202 17.6924C9.93164 17.8888 9.67073 18 9.3985 18.0001C9.12638 18 8.86632 17.8887 8.6778 17.6924L4.27838 13.1124C3.89612 12.714 3.90943 12.0808 4.30768 11.6983C4.70604 11.3161 5.33929 11.3294 5.72174 11.7276L9.39752 15.5557L18.2784 6.30768Z"), ) }.build() return _ic_checkmark_24!! diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcClock12.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcClock12.kt index 15d9512929..3b3447d5c4 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcClock12.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcClock12.kt @@ -35,7 +35,7 @@ val Icons.ic_clock_12: ImageVector ) addPath( fill = SolidColor(Color.Black), - pathFillType = PathFillType.EvenOdd, + pathFillType = PathFillType.NonZero, pathData = addPathNodes("M6 1C8.76142 1 11 3.23858 11 6C11 8.76142 8.76142 11 6 11C3.23858 11 1 8.76142 1 6C1 3.23858 3.23858 1 6 1ZM6 2C3.79086 2 2 3.79086 2 6C2 8.20914 3.79086 10 6 10C8.20914 10 10 8.20914 10 6C10 3.79086 8.20914 2 6 2Z"), ) }.build() diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcClock16.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcClock16.kt index e74be3345c..ac4448c990 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcClock16.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcClock16.kt @@ -31,11 +31,11 @@ val Icons.ic_clock_16: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M8.36523 4.5C8.71001 4.50033 8.99003 4.7802 8.99023 5.125V8.26074C8.99023 8.60572 8.71014 8.88542 8.36523 8.88574H6.125C5.77982 8.88574 5.5 8.60592 5.5 8.26074C5.50026 7.91578 5.77998 7.63574 6.125 7.63574H7.74023V5.125C7.74044 4.78 8.02018 4.5 8.36523 4.5Z"), + pathData = addPathNodes("M8.36523 4.5C8.71001 4.50033 8.99003 4.7802 8.99023 5.125V8.26074C8.99023 8.60572 8.71014 8.88542 8.36523 8.88574H6.125C5.77982 8.88574 5.5 8.60592 5.5 8.26074C5.50026 7.91578 5.77998 7.63574 6.125 7.63574H7.74023V5.125C7.74044 4.77999 8.02018 4.5 8.36523 4.5Z"), ) addPath( fill = SolidColor(Color.Black), - pathFillType = PathFillType.EvenOdd, + pathFillType = PathFillType.NonZero, pathData = addPathNodes("M8.30957 2.00781C11.48 2.16874 14.001 4.79058 14.001 8.00098C14.0007 11.3147 11.3146 14.0006 8.00098 14.001C4.68703 14.001 2.00027 11.3149 2 8.00098C2 4.68687 4.68687 2 8.00098 2L8.30957 2.00781ZM8.00098 3.25C5.37722 3.25 3.25 5.37722 3.25 8.00098C3.25027 10.6245 5.37739 12.751 8.00098 12.751C10.6243 12.7506 12.7507 10.6243 12.751 8.00098C12.751 5.37743 10.6244 3.25033 8.00098 3.25Z"), ) }.build() diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcClock20.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcClock20.kt index 44e589f073..e32940208c 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcClock20.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcClock20.kt @@ -35,7 +35,7 @@ val Icons.ic_clock_20: ImageVector ) addPath( fill = SolidColor(Color.Black), - pathFillType = PathFillType.EvenOdd, + pathFillType = PathFillType.NonZero, pathData = addPathNodes("M10.4092 2.01074C14.6352 2.2248 17.996 5.71889 17.9961 9.99805C17.996 14.4151 14.4151 17.996 9.99805 17.9961C5.581 17.996 2.00007 14.4151 2 9.99805C2.00005 5.58099 5.58099 2.00005 9.99805 2L10.4092 2.01074ZM9.99805 3.5C6.40942 3.50005 3.50005 6.40942 3.5 9.99805C3.50007 13.5867 6.40943 16.496 9.99805 16.4961C13.5867 16.496 16.496 13.5867 16.4961 9.99805C16.496 6.40943 13.5867 3.50007 9.99805 3.5Z"), ) }.build() diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcClock24.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcClock24.kt index 5addfb5842..64e7264cbd 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcClock24.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcClock24.kt @@ -35,7 +35,7 @@ val Icons.ic_clock_24: ImageVector ) addPath( fill = SolidColor(Color.Black), - pathFillType = PathFillType.EvenOdd, + pathFillType = PathFillType.NonZero, pathData = addPathNodes("M12 2C17.5228 2 22 6.47715 22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2ZM12 4C7.58172 4 4 7.58172 4 12C4 16.4183 7.58172 20 12 20C16.4183 20 20 16.4183 20 12C20 7.58172 16.4183 4 12 4Z"), ) }.build() diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcClock28.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcClock28.kt new file mode 100644 index 0000000000..efd839d0ff --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcClock28.kt @@ -0,0 +1,52 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_clock_28: ImageVector? = null + +val Icons.ic_clock_28: ImageVector + get() { + if (_ic_clock_28 != null) return _ic_clock_28!! + _ic_clock_28 = ImageVector.Builder( + name = "ic_clock_28", + defaultWidth = 28.dp, + defaultHeight = 28.dp, + viewportWidth = 28f, + viewportHeight = 28f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M14.522 6.77881C15.2123 6.77881 15.7719 7.33851 15.772 8.02881V14.5981C15.7717 15.2883 15.2122 15.8481 14.522 15.8481H9.74463C9.05481 15.8477 8.49492 15.288 8.49463 14.5981C8.4947 13.9081 9.05468 13.3486 9.74463 13.3481H13.272V8.02881C13.272 7.33887 13.8321 6.77938 14.522 6.77881Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M14.3101 2.00439C20.7939 2.16878 25.9993 7.47709 25.9995 14.0005C25.9993 20.6274 20.6274 25.9993 14.0005 25.9995C7.37353 25.9993 2.00068 20.6274 2.00049 14.0005C2.00072 7.37357 7.37355 2.00065 14.0005 2.00049L14.3101 2.00439ZM14.0005 4.50049C8.75426 4.50065 4.50072 8.75428 4.50049 14.0005C4.50068 19.2467 8.75424 23.4993 14.0005 23.4995C19.2467 23.4993 23.4993 19.2467 23.4995 14.0005C23.4993 8.7543 19.2467 4.50068 14.0005 4.50049Z"), + ) + }.build() + return _ic_clock_28!! + } + +@Composable +@Preview(showBackground = true) +private fun IcClock28Preview() { + Icon( + imageVector = Icons.ic_clock_28, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcClock32.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcClock32.kt index 8be8dcea32..843232e4f3 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcClock32.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcClock32.kt @@ -35,7 +35,7 @@ val Icons.ic_clock_32: ImageVector ) addPath( fill = SolidColor(Color.Black), - pathFillType = PathFillType.EvenOdd, + pathFillType = PathFillType.NonZero, pathData = addPathNodes("M16.001 4C22.6288 4.00026 28.0027 9.37314 28.0029 16.001C28.0027 22.6288 22.6288 28.0027 16.001 28.0029C9.37314 28.0027 4.00026 22.6288 4 16.001C4.00026 9.37313 9.37313 4.00026 16.001 4ZM16.001 6.5C10.7538 6.50026 6.50026 10.7538 6.5 16.001C6.50026 21.2481 10.7538 25.5027 16.001 25.5029C21.2481 25.5027 25.5027 21.2481 25.5029 16.001C25.5027 10.7538 21.2481 6.50026 16.001 6.5Z"), ) }.build() diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcCloud16.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcCloud16.kt index 46fd08bb02..7fbeed631c 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcCloud16.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcCloud16.kt @@ -31,7 +31,7 @@ val Icons.ic_cloud_16: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M8 3.375C10.1072 3.375 11.8925 4.86911 12.1826 6.8584C13.556 7.11784 14.6248 8.27613 14.625 9.71387C14.625 11.3498 13.2412 12.625 11.5996 12.625H5C3.02705 12.625 1.375 11.0941 1.375 9.14258L1.37891 8.97754C1.45745 7.41255 2.61167 6.12397 4.14746 5.77051C4.82684 4.31304 6.33845 3.37577 8 3.375ZM8 4.625C6.70774 4.62572 5.58437 5.40923 5.18262 6.53516C5.10338 6.75663 4.90622 6.9146 4.67285 6.94434C3.47814 7.09672 2.62729 8.05592 2.625 9.14355C2.6254 10.3476 3.6595 11.375 5 11.375H11.5996C12.609 11.375 13.375 10.6027 13.375 9.71387C13.3748 8.82524 12.6088 8.05371 11.5996 8.05371C11.2547 8.0535 10.9747 7.77369 10.9746 7.42871C10.9746 5.90873 9.67213 4.625 8 4.625Z"), + pathData = addPathNodes("M8 3.375C10.1072 3.375 11.8925 4.86911 12.1826 6.8584C13.556 7.11784 14.6248 8.27613 14.625 9.71387C14.625 11.3498 13.2412 12.625 11.5996 12.625H5C3.02705 12.625 1.375 11.0941 1.375 9.14258L1.37891 8.97754C1.45745 7.41255 2.61167 6.12397 4.14746 5.77051C4.82684 4.31304 6.33845 3.37577 8 3.375ZM8 4.625C6.70774 4.62572 5.58437 5.40923 5.18262 6.53516C5.10338 6.75663 4.90621 6.9146 4.67285 6.94434C3.47814 7.09672 2.62729 8.05592 2.625 9.14355C2.6254 10.3476 3.6595 11.375 5 11.375H11.5996C12.609 11.375 13.375 10.6027 13.375 9.71387C13.3748 8.82524 12.6088 8.05371 11.5996 8.05371C11.2547 8.0535 10.9747 7.77369 10.9746 7.42871C10.9746 5.90873 9.67213 4.625 8 4.625Z"), ) }.build() return _ic_cloud_16!! diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcCopy16.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcCopy16.kt index 1c2f4cd054..e3baa9973a 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcCopy16.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcCopy16.kt @@ -31,7 +31,7 @@ val Icons.ic_copy_16: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M7.23633 4.93848C7.78585 4.93848 8.23583 4.93797 8.60059 4.96777C8.97264 4.99819 9.3113 5.06328 9.62793 5.22461C10.1217 5.47629 10.5238 5.87829 10.7754 6.37207C10.9365 6.68855 11.0009 7.02757 11.0313 7.39941C11.061 7.76414 11.0615 8.21431 11.0615 8.76367V9.67285C11.0615 10.2223 11.061 10.6724 11.0313 11.0371C11.0008 11.4091 10.9367 11.7479 10.7754 12.0645C10.5237 12.5583 10.1218 12.9603 9.62793 13.2119C9.31131 13.3732 8.97262 13.4374 8.60059 13.4678C8.23583 13.4976 7.78585 13.498 7.23633 13.498H6.32715C5.77772 13.498 5.32764 13.4975 4.96289 13.4678C4.59102 13.4374 4.25204 13.373 3.93555 13.2119C3.44178 12.9603 3.03977 12.5582 2.78809 12.0645C2.62678 11.7479 2.56167 11.4091 2.53125 11.0371C2.50145 10.6724 2.50195 10.2223 2.50195 9.67285V8.76367C2.50195 8.21431 2.5015 7.76414 2.53125 7.39941C2.56164 7.02743 2.62688 6.68865 2.78809 6.37207C3.03975 5.87815 3.44162 5.47628 3.93555 5.22461C4.25218 5.06334 4.59084 4.99817 4.96289 4.96777C5.32764 4.93801 5.77771 4.93848 6.32715 4.93848H7.23633ZM6.32715 6.18848C5.757 6.18848 5.36656 6.18921 5.06445 6.21387C4.76993 6.23793 4.61402 6.28136 4.50293 6.33789C4.24421 6.46972 4.03319 6.68073 3.90137 6.93945C3.84488 7.05054 3.8014 7.20661 3.77734 7.50098C3.7527 7.80306 3.75195 8.19363 3.75195 8.76367V9.67285C3.75195 10.2429 3.75267 10.6335 3.77734 10.9355C3.80145 11.23 3.84479 11.386 3.90137 11.4971C4.03321 11.7556 4.24433 11.9659 4.50293 12.0977C4.61402 12.1542 4.76999 12.1986 5.06445 12.2227C5.36654 12.2473 5.75706 12.248 6.32715 12.248H7.23633C7.80643 12.248 8.19696 12.2473 8.49902 12.2227C8.79361 12.1986 8.94948 12.1542 9.06055 12.0977C9.31902 11.9659 9.52934 11.7555 9.66113 11.4971C9.71771 11.386 9.76203 11.23 9.78613 10.9355C9.81081 10.6335 9.81152 10.2429 9.81152 9.67285V8.76367C9.81152 8.19367 9.81077 7.80305 9.78613 7.50098C9.76208 7.20657 9.71763 7.05054 9.66113 6.93945C9.52936 6.68084 9.31912 6.46973 9.06055 6.33789C8.94949 6.28131 8.79354 6.23797 8.49902 6.21387C8.19696 6.18919 7.80643 6.18848 7.23633 6.18848H6.32715Z"), + pathData = addPathNodes("M7.23633 4.93848C7.78585 4.93848 8.23583 4.93797 8.60059 4.96777C8.97264 4.99819 9.3113 5.06328 9.62793 5.22461C10.1217 5.47629 10.5238 5.87829 10.7754 6.37207C10.9365 6.68855 11.0009 7.02757 11.0313 7.39941C11.061 7.76414 11.0615 8.21431 11.0615 8.76367V9.67285C11.0615 10.2223 11.061 10.6724 11.0313 11.0371C11.0008 11.4091 10.9367 11.7479 10.7754 12.0645C10.5237 12.5583 10.1218 12.9603 9.62793 13.2119C9.31131 13.3732 8.97262 13.4374 8.60059 13.4678C8.23583 13.4976 7.78585 13.498 7.23633 13.498H6.32715C5.77772 13.498 5.32764 13.4975 4.96289 13.4678C4.59102 13.4374 4.25204 13.373 3.93555 13.2119C3.44178 12.9603 3.03977 12.5582 2.78809 12.0645C2.62678 11.7479 2.56167 11.4091 2.53125 11.0371C2.50145 10.6724 2.50195 10.2223 2.50195 9.67285V8.76367C2.50195 8.21431 2.5015 7.76414 2.53125 7.39941C2.56164 7.02743 2.62688 6.68865 2.78809 6.37207C3.03975 5.87815 3.44162 5.47628 3.93555 5.22461C4.25218 5.06334 4.59084 4.99817 4.96289 4.96777C5.32764 4.93801 5.77771 4.93848 6.32715 4.93848H7.23633ZM6.32715 6.18848C5.757 6.18848 5.36655 6.18921 5.06445 6.21387C4.76993 6.23793 4.61402 6.28136 4.50293 6.33789C4.24421 6.46972 4.03319 6.68073 3.90137 6.93945C3.84488 7.05054 3.8014 7.20661 3.77734 7.50098C3.7527 7.80306 3.75195 8.19363 3.75195 8.76367V9.67285C3.75195 10.2429 3.75267 10.6335 3.77734 10.9355C3.80145 11.23 3.84479 11.386 3.90137 11.4971C4.03321 11.7556 4.24433 11.9659 4.50293 12.0977C4.61402 12.1542 4.76999 12.1986 5.06445 12.2227C5.36654 12.2473 5.75706 12.248 6.32715 12.248H7.23633C7.80643 12.248 8.19696 12.2473 8.49902 12.2227C8.79361 12.1986 8.94948 12.1542 9.06055 12.0977C9.31902 11.9659 9.52934 11.7555 9.66113 11.4971C9.71771 11.386 9.76203 11.23 9.78613 10.9355C9.81081 10.6335 9.81152 10.2429 9.81152 9.67285V8.76367C9.81152 8.19367 9.81077 7.80305 9.78613 7.50098C9.76208 7.20657 9.71763 7.05054 9.66113 6.93945C9.52936 6.68084 9.31912 6.46973 9.06055 6.33789C8.94949 6.28131 8.79354 6.23797 8.49902 6.21387C8.19696 6.18919 7.80643 6.18848 7.23633 6.18848H6.32715Z"), ) addPath( fill = SolidColor(Color.Black), diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcCopy20.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcCopy20.kt index 086ffbdcbf..05630af380 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcCopy20.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcCopy20.kt @@ -31,7 +31,7 @@ val Icons.ic_copy_20: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M9.125 6.125C9.81266 6.125 10.3736 6.124 10.8281 6.16113C11.2914 6.19898 11.7099 6.2804 12.1006 6.47949C12.7119 6.79105 13.209 7.28807 13.5205 7.89941C13.7195 8.2901 13.801 8.70869 13.8389 9.17188C13.876 9.62634 13.875 10.1874 13.875 10.875V12.25C13.875 12.9375 13.876 13.4987 13.8389 13.9531C13.801 14.4163 13.7196 14.8349 13.5205 15.2256C13.2089 15.837 12.7121 16.3349 12.1006 16.6465C11.7099 16.8455 11.2913 16.926 10.8281 16.9639C10.3736 17.001 9.81266 17 9.125 17H7.75C7.06232 17 6.50138 17.001 6.04688 16.9639C5.5837 16.926 5.1651 16.8455 4.77442 16.6465C4.16295 16.3349 3.66609 15.837 3.35449 15.2256C3.15544 14.8349 3.07399 14.4163 3.03614 13.9531C2.99903 13.4987 3 12.9375 3 12.25V10.875C3 10.1874 2.99902 9.62634 3.03614 9.17188C3.07398 8.70869 3.15547 8.2901 3.35449 7.89941C3.66604 7.28808 4.16309 6.79106 4.77442 6.47949C5.16514 6.28041 5.58363 6.19898 6.04688 6.16113C6.50138 6.124 7.06232 6.125 7.75 6.125H9.125ZM7.75 7.625C7.03757 7.625 6.5482 7.62526 6.16895 7.65625C5.79853 7.68652 5.5991 7.74205 5.45508 7.81543C5.12602 7.98318 4.85816 8.251 4.69043 8.58008C4.61709 8.72409 4.56151 8.92366 4.53125 9.29395C4.50028 9.67317 4.5 10.1627 4.5 10.875V12.25C4.5 12.9622 4.50028 13.4519 4.53125 13.8311C4.56153 14.2014 4.61705 14.4009 4.69043 14.5449C4.85816 14.874 5.12601 15.1418 5.45508 15.3096C5.5991 15.3829 5.79861 15.4385 6.16895 15.4688C6.5482 15.4997 7.03757 15.5 7.75 15.5H9.125C9.83743 15.5 10.3268 15.4997 10.7061 15.4688C11.0765 15.4385 11.2759 15.3829 11.4199 15.3096C11.749 15.1418 12.0168 14.874 12.1846 14.5449C12.258 14.4009 12.3135 14.2014 12.3438 13.8311C12.3747 13.4519 12.375 12.9622 12.375 12.25V10.875C12.375 10.1627 12.3747 9.67317 12.3438 9.29395C12.3135 8.92366 12.2579 8.72409 12.1846 8.58008C12.0168 8.25099 11.749 7.98317 11.4199 7.81543C11.2759 7.74204 11.0765 7.68652 10.7061 7.65625C10.3268 7.62526 9.83744 7.625 9.125 7.625H7.75Z"), + pathData = addPathNodes("M9.125 6.125C9.81266 6.125 10.3736 6.124 10.8281 6.16113C11.2914 6.19898 11.7099 6.2804 12.1006 6.47949C12.7119 6.79105 13.209 7.28807 13.5205 7.89941C13.7195 8.2901 13.801 8.70869 13.8389 9.17188C13.876 9.62634 13.875 10.1874 13.875 10.875V12.25C13.875 12.9375 13.876 13.4987 13.8389 13.9531C13.801 14.4163 13.7196 14.8349 13.5205 15.2256C13.2089 15.837 12.7121 16.3349 12.1006 16.6465C11.7099 16.8455 11.2913 16.926 10.8281 16.9639C10.3736 17.001 9.81266 17 9.125 17H7.75C7.06232 17 6.50138 17.001 6.04688 16.9639C5.5837 16.926 5.1651 16.8455 4.77442 16.6465C4.16295 16.3349 3.66609 15.837 3.35449 15.2256C3.15544 14.8349 3.07399 14.4163 3.03614 13.9531C2.99903 13.4987 3 12.9375 3 12.25V10.875C3 10.1874 2.99902 9.62634 3.03614 9.17188C3.07398 8.70869 3.15547 8.2901 3.35449 7.89941C3.66604 7.28808 4.16309 6.79106 4.77442 6.47949C5.16514 6.28041 5.58363 6.19898 6.04688 6.16113C6.50138 6.124 7.06232 6.125 7.75 6.125H9.125ZM7.75 7.625C7.03757 7.625 6.5482 7.62526 6.16895 7.65625C5.79853 7.68652 5.5991 7.74205 5.45508 7.81543C5.12601 7.98318 4.85816 8.251 4.69043 8.58008C4.61709 8.72409 4.56151 8.92366 4.53125 9.29395C4.50028 9.67317 4.5 10.1627 4.5 10.875V12.25C4.5 12.9622 4.50028 13.4519 4.53125 13.8311C4.56153 14.2014 4.61705 14.4009 4.69043 14.5449C4.85816 14.874 5.12601 15.1418 5.45508 15.3096C5.5991 15.3829 5.79861 15.4385 6.16895 15.4688C6.5482 15.4997 7.03757 15.5 7.75 15.5H9.125C9.83743 15.5 10.3268 15.4997 10.7061 15.4688C11.0765 15.4385 11.2759 15.3829 11.4199 15.3096C11.749 15.1418 12.0168 14.874 12.1846 14.5449C12.258 14.4009 12.3135 14.2014 12.3438 13.8311C12.3747 13.4519 12.375 12.9622 12.375 12.25V10.875C12.375 10.1627 12.3747 9.67317 12.3438 9.29395C12.3135 8.92366 12.2579 8.72409 12.1846 8.58008C12.0168 8.25099 11.749 7.98317 11.4199 7.81543C11.2759 7.74204 11.0765 7.68652 10.7061 7.65625C10.3268 7.62526 9.83744 7.625 9.125 7.625H7.75Z"), ) addPath( fill = SolidColor(Color.Black), diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcDotsHorizontal24.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcDotsHorizontal24.kt index acca0be2b8..6199b70fc6 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcDotsHorizontal24.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcDotsHorizontal24.kt @@ -31,7 +31,7 @@ val Icons.ic_dots_horizontal_24: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M6.09953 10.5059C6.87727 10.5599 7.49688 11.2045 7.49699 12C7.49686 12.8273 6.82427 13.5 5.99699 13.5C5.17312 13.4997 4.50325 12.8325 4.49797 12.0098L4.49699 12.0107C4.48844 11.2094 5.11151 10.5611 5.88761 10.5059C5.92247 10.5022 5.95823 10.5 5.99406 10.5C6.02951 10.5 6.06503 10.5023 6.09953 10.5059Z"), + pathData = addPathNodes("M6.09953 10.5059C6.87727 10.5599 7.49688 11.2045 7.49699 12C7.49686 12.8273 6.82428 13.5 5.99699 13.5C5.17312 13.4997 4.50325 12.8325 4.49797 12.0098L4.49699 12.0107C4.48844 11.2094 5.11151 10.5611 5.88761 10.5059C5.92247 10.5022 5.95823 10.5 5.99406 10.5C6.02951 10.5 6.06503 10.5023 6.09953 10.5059Z"), ) addPath( fill = SolidColor(Color.Black), diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcEdit20.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcEdit20.kt index 4579e6d927..9baedb074d 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcEdit20.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcEdit20.kt @@ -36,7 +36,7 @@ val Icons.ic_edit_20: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M14.7041 3C15.3127 3.00063 15.8962 3.24314 16.3262 3.67383C16.757 4.10457 16.999 4.68886 16.999 5.29785C16.999 5.90709 16.7569 6.49135 16.3262 6.92188C16.3189 6.92918 16.3103 6.93545 16.3027 6.94238H16.3047C16.3081 6.93926 16.3135 6.93451 16.3154 6.93262L15.834 7.41406C15.5321 7.7158 15.1182 8.12892 14.6719 8.5752C13.7792 9.46776 12.7549 10.4922 12.2285 11.0186C11.8808 11.3662 11.4265 11.5868 10.9385 11.6465L9.86133 11.7803C9.40623 11.8364 8.95107 11.6769 8.62988 11.3496C8.30873 11.0223 8.15798 10.5643 8.22266 10.1104L8.38184 8.99317C8.44827 8.52187 8.66648 8.08476 9.00293 7.74805C9.73986 7.0108 11.5406 5.20998 13.0791 3.67188C13.51 3.24129 14.0949 2.99946 14.7041 3ZM15.2656 4.7334C15.1166 4.58395 14.9132 4.50024 14.7021 4.5C14.5177 4.49995 14.3398 4.56396 14.1982 4.67969L14.1396 4.73242C12.6013 6.27043 10.8013 8.07145 10.0645 8.80859C9.95776 8.91535 9.8881 9.05365 9.86719 9.20313V9.20606L9.71289 10.2861L10.7549 10.1582H10.7568C10.9123 10.1391 11.0572 10.0687 11.168 9.95801L15.2686 5.85742C15.416 5.70838 15.499 5.50744 15.499 5.29785C15.499 5.08655 15.4149 4.88268 15.2656 4.7334Z"), + pathData = addPathNodes("M14.7041 3C15.3127 3.00063 15.8962 3.24314 16.3262 3.67383C16.757 4.10457 16.999 4.68886 16.999 5.29785C16.999 5.90709 16.7569 6.49135 16.3262 6.92188C16.3189 6.92918 16.3103 6.93545 16.3027 6.94238H16.3047C16.3081 6.93926 16.3135 6.93451 16.3154 6.93262L15.834 7.41406C15.5321 7.7158 15.1182 8.12892 14.6719 8.5752C13.7792 9.46775 12.7549 10.4922 12.2285 11.0186C11.8808 11.3662 11.4265 11.5868 10.9385 11.6465L9.86133 11.7803C9.40623 11.8364 8.95107 11.6769 8.62988 11.3496C8.30873 11.0223 8.15798 10.5643 8.22266 10.1104L8.38184 8.99317C8.44827 8.52187 8.66648 8.08476 9.00293 7.74805C9.73986 7.0108 11.5406 5.20998 13.0791 3.67188C13.51 3.24129 14.0949 2.99946 14.7041 3ZM15.2656 4.7334C15.1166 4.58395 14.9132 4.50024 14.7021 4.5C14.5177 4.49995 14.3398 4.56396 14.1982 4.67969L14.1396 4.73242C12.6013 6.27043 10.8013 8.07145 10.0645 8.80859C9.95776 8.91535 9.8881 9.05365 9.86719 9.20313V9.20606L9.71289 10.2861L10.7549 10.1582H10.7568C10.9123 10.1391 11.0572 10.0687 11.168 9.95801L15.2686 5.85742C15.416 5.70838 15.499 5.50744 15.499 5.29785C15.499 5.08655 15.4149 4.88268 15.2656 4.7334Z"), ) }.build() return _ic_edit_20!! diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcError16.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcError16.kt index c42c4c1bfe..a6f8941a91 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcError16.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcError16.kt @@ -31,7 +31,7 @@ val Icons.ic_error_16: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M8.0791 10.0029C8.47125 10.0427 8.77901 10.3735 8.7793 10.7783C8.77927 11.2087 8.43035 11.5576 8 11.5576C7.59677 11.5574 7.26459 11.2512 7.22461 10.8584L7.2207 10.7783C7.22033 10.3459 7.57225 9.99916 8 9.99902L8.0791 10.0029Z"), + pathData = addPathNodes("M8.0791 10.0029C8.47125 10.0427 8.77901 10.3735 8.7793 10.7783C8.77927 11.2087 8.43035 11.5576 8 11.5576C7.59677 11.5574 7.26459 11.2512 7.22461 10.8584L7.2207 10.7783C7.22032 10.3459 7.57225 9.99916 8 9.99902L8.0791 10.0029Z"), ) addPath( fill = SolidColor(Color.Black), diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcError20.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcError20.kt index 313bc452b5..12171f0943 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcError20.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcError20.kt @@ -41,7 +41,7 @@ val Icons.ic_error_20: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M12.5537 2.00195C13.1795 2.00199 13.7802 2.25102 14.2227 2.69336L17.3047 5.77539C17.7485 6.21806 17.998 6.81932 17.998 7.44531V12.5537C17.998 13.1795 17.749 13.7802 17.3066 14.2227L13.752 17.7783C13.6113 17.919 13.4196 17.998 13.2207 17.998H7.44531C6.81953 17.998 6.21879 17.7489 5.77637 17.3066L2.69336 14.2236C2.25101 13.7812 2.00204 13.1805 2.00195 12.5547V7.44531C2.00201 6.81948 2.25098 6.2188 2.69336 5.77637L5.77637 2.69336C6.21881 2.25099 6.81947 2.002 7.44531 2.00195H12.5537ZM7.44531 3.50195C7.21775 3.502 6.99836 3.59252 6.83691 3.75391L3.75391 6.83691C3.59252 6.99836 3.50201 7.21775 3.50195 7.44531V12.5547C3.50204 12.7822 3.59255 13.0017 3.75391 13.1631L6.83691 16.2451C6.99838 16.4066 7.21769 16.498 7.44531 16.498H12.9102L16.2451 13.1621C16.4066 13.0006 16.498 12.7813 16.498 12.5537V7.44531C16.498 7.2178 16.4068 6.99912 16.2451 6.83789L13.1621 3.75391C13.0007 3.59255 12.7813 3.50199 12.5537 3.50195H7.44531Z"), + pathData = addPathNodes("M12.5537 2.00195C13.1795 2.00199 13.7802 2.25102 14.2227 2.69336L17.3047 5.77539C17.7485 6.21806 17.998 6.81932 17.998 7.44531V12.5537C17.998 13.1795 17.749 13.7802 17.3066 14.2227L13.752 17.7783C13.6113 17.919 13.4196 17.998 13.2207 17.998H7.44531C6.81953 17.998 6.21879 17.7489 5.77637 17.3066L2.69336 14.2236C2.25101 13.7812 2.00204 13.1805 2.00195 12.5547V7.44531C2.00201 6.81948 2.25098 6.2188 2.69336 5.77637L5.77637 2.69336C6.21881 2.25099 6.81947 2.002 7.44531 2.00195H12.5537ZM7.44531 3.50195C7.21775 3.502 6.99836 3.59252 6.83691 3.75391L3.75391 6.83691C3.59252 6.99836 3.502 7.21775 3.50195 7.44531V12.5547C3.50204 12.7822 3.59255 13.0017 3.75391 13.1631L6.83691 16.2451C6.99838 16.4066 7.21769 16.498 7.44531 16.498H12.9102L16.2451 13.1621C16.4066 13.0006 16.498 12.7813 16.498 12.5537V7.44531C16.498 7.2178 16.4068 6.99912 16.2451 6.83789L13.1621 3.75391C13.0007 3.59255 12.7813 3.50199 12.5537 3.50195H7.44531Z"), ) }.build() return _ic_error_20!! diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcError24.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcError24.kt index 81976a905c..fe6b8d1bca 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcError24.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcError24.kt @@ -41,7 +41,7 @@ val Icons.ic_error_24: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M15.1709 2C15.9664 2 16.7297 2.31661 17.292 2.87891L21.1191 6.70605L21.3193 6.92578C21.7579 7.45976 22 8.13194 22 8.82812V15.1709C22 15.9664 21.6834 16.7297 21.1211 17.292L16.707 21.707C16.5195 21.8946 16.2652 22 16 22H8.82812C8.03264 22 7.26935 21.6834 6.70703 21.1211L2.87891 17.293C2.31662 16.7307 2 15.9674 2 15.1719V8.82812C2 8.03264 2.31662 7.26935 2.87891 6.70703L6.70703 2.87891C7.26935 2.31662 8.03264 2 8.82812 2H15.1709ZM8.82812 4C8.56367 4 8.30876 4.10533 8.12109 4.29297L4.29297 8.12109C4.10533 8.30876 4 8.56367 4 8.82812V15.1719C4 15.4363 4.10533 15.6912 4.29297 15.8789L8.12109 19.707C8.30876 19.8947 8.56367 20 8.82812 20H15.5859L19.707 15.8779L19.7734 15.8047C19.9194 15.6266 20 15.4024 20 15.1709V8.82812C20 8.56383 19.8948 8.30943 19.707 8.12207L15.8779 4.29297C15.6903 4.10533 15.4354 4 15.1709 4H8.82812Z"), + pathData = addPathNodes("M15.1709 2C15.9664 2 16.7297 2.31661 17.292 2.87891L21.1191 6.70605L21.3193 6.92578C21.7579 7.45976 22 8.13194 22 8.82812V15.1709C22 15.9664 21.6834 16.7297 21.1211 17.292L16.707 21.707C16.5195 21.8946 16.2652 22 16 22H8.82812C8.03264 22 7.26935 21.6834 6.70703 21.1211L2.87891 17.293C2.31662 16.7306 2 15.9674 2 15.1719V8.82812C2 8.03264 2.31662 7.26935 2.87891 6.70703L6.70703 2.87891C7.26935 2.31662 8.03264 2 8.82812 2H15.1709ZM8.82812 4C8.56367 4 8.30876 4.10533 8.12109 4.29297L4.29297 8.12109C4.10533 8.30876 4 8.56367 4 8.82812V15.1719C4 15.4363 4.10533 15.6912 4.29297 15.8789L8.12109 19.707C8.30876 19.8947 8.56367 20 8.82812 20H15.5859L19.707 15.8779L19.7734 15.8047C19.9194 15.6266 20 15.4024 20 15.1709V8.82812C20 8.56383 19.8948 8.30943 19.707 8.12207L15.8779 4.29297C15.6903 4.10533 15.4354 4 15.1709 4H8.82812Z"), ) }.build() return _ic_error_24!! diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGauge20.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGauge20.kt index 38ea6a4dc4..215ed7a2c0 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGauge20.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGauge20.kt @@ -36,7 +36,7 @@ val Icons.ic_gauge_20: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M12.1219 6.72445C12.4133 6.43066 12.8883 6.42759 13.1825 6.71859C13.4765 7.00977 13.479 7.48477 13.1883 7.77914L10.4637 10.5311C10.1723 10.8253 9.69749 10.8273 9.40318 10.536C9.1089 10.2446 9.10599 9.76976 9.39732 9.47543L12.1219 6.72445Z"), + pathData = addPathNodes("M12.1219 6.72445C12.4133 6.43067 12.8883 6.42759 13.1825 6.71859C13.4765 7.00977 13.479 7.48477 13.1883 7.77914L10.4637 10.5311C10.1723 10.8253 9.69749 10.8273 9.40318 10.536C9.1089 10.2446 9.10599 9.76976 9.39732 9.47543L12.1219 6.72445Z"), ) }.build() return _ic_gauge_20!! diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGrid16.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGrid16.kt new file mode 100644 index 0000000000..27248eb1b2 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGrid16.kt @@ -0,0 +1,62 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_grid_16: ImageVector? = null + +val Icons.ic_grid_16: ImageVector + get() { + if (_ic_grid_16 != null) return _ic_grid_16!! + _ic_grid_16 = ImageVector.Builder( + name = "ic_grid_16", + defaultWidth = 16.dp, + defaultHeight = 16.dp, + viewportWidth = 16f, + viewportHeight = 16f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M5.46191 8.71777C6.46661 8.71817 7.28125 9.53232 7.28125 10.5371V12.1797C7.28095 13.1842 6.46643 13.9986 5.46191 13.999H3.81934C2.81448 13.999 2.0003 13.1845 2 12.1797V10.5371C2 9.53207 2.8143 8.71777 3.81934 8.71777H5.46191ZM3.81934 9.96777C3.50465 9.96777 3.25 10.2224 3.25 10.5371V12.1797C3.25029 12.4941 3.50484 12.749 3.81934 12.749H5.46191C5.77607 12.7486 6.03096 12.4939 6.03125 12.1797V10.5371C6.03125 10.2227 5.77626 9.96817 5.46191 9.96777H3.81934Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M12.1797 8.71777C13.1844 8.71818 13.999 9.53233 13.999 10.5371V12.1797C13.9987 13.1842 13.1842 13.9986 12.1797 13.999H10.5371C9.53225 13.999 8.71807 13.1845 8.71777 12.1797V10.5371C8.71777 9.53207 9.53207 8.71777 10.5371 8.71777H12.1797ZM10.5371 9.96777C10.2224 9.96777 9.96777 10.2224 9.96777 10.5371V12.1797C9.96807 12.4941 10.2226 12.749 10.5371 12.749H12.1797C12.4938 12.7486 12.7487 12.4939 12.749 12.1797V10.5371C12.749 10.2227 12.494 9.96818 12.1797 9.96777H10.5371Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M5.46191 2C6.46661 2.0004 7.28125 2.81454 7.28125 3.81934V5.46191C7.2808 6.46632 6.46634 7.28085 5.46191 7.28125H3.81934C2.81458 7.28125 2.00045 6.46657 2 5.46191V3.81934C2 2.8143 2.8143 2 3.81934 2H5.46191ZM3.81934 3.25C3.50465 3.25 3.25 3.50465 3.25 3.81934V5.46191C3.25045 5.77621 3.50493 6.03125 3.81934 6.03125H5.46191C5.77598 6.03085 6.0308 5.77597 6.03125 5.46191V3.81934C6.03125 3.5049 5.77626 3.2504 5.46191 3.25H3.81934Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M12.1797 2C13.1844 2.00041 13.999 2.81455 13.999 3.81934V5.46191C13.9986 6.46632 13.1841 7.28084 12.1797 7.28125H10.5371C9.53235 7.28125 8.71822 6.46657 8.71777 5.46191V3.81934C8.71777 2.8143 9.53207 2 10.5371 2H12.1797ZM10.5371 3.25C10.2224 3.25 9.96777 3.50465 9.96777 3.81934V5.46191C9.96822 5.77621 10.2227 6.03125 10.5371 6.03125H12.1797C12.4937 6.03084 12.7486 5.77596 12.749 5.46191V3.81934C12.749 3.50491 12.494 3.25041 12.1797 3.25H10.5371Z"), + ) + }.build() + return _ic_grid_16!! + } + +@Composable +@Preview(showBackground = true) +private fun IcGrid16Preview() { + Icon( + imageVector = Icons.ic_grid_16, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGrid20.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGrid20.kt new file mode 100644 index 0000000000..ec3c16e81f --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGrid20.kt @@ -0,0 +1,62 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_grid_20: ImageVector? = null + +val Icons.ic_grid_20: ImageVector + get() { + if (_ic_grid_20 != null) return _ic_grid_20!! + _ic_grid_20 = ImageVector.Builder( + name = "ic_grid_20", + defaultWidth = 20.dp, + defaultHeight = 20.dp, + viewportWidth = 20f, + viewportHeight = 20f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M6.57617 11.0615C7.88022 11.0617 8.93652 12.1188 8.93652 13.4229V15.6377C8.93616 16.9415 7.88 17.9978 6.57617 17.998H4.36133C3.05744 17.9979 2.00036 16.9415 2 15.6377V13.4229C2 12.1187 3.05722 11.0616 4.36133 11.0615H6.57617ZM4.36133 12.5615C3.88564 12.5616 3.5 12.9471 3.5 13.4229V15.6377C3.50036 16.1131 3.88587 16.4979 4.36133 16.498H6.57617C7.05157 16.4978 7.43616 16.1131 7.43652 15.6377V13.4229C7.43652 12.9472 7.05179 12.5617 6.57617 12.5615H4.36133Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M15.6377 11.0615C16.9417 11.0618 17.998 12.1188 17.998 13.4229V15.6377C17.9977 16.9414 16.9415 17.9978 15.6377 17.998H13.4229C12.1189 17.998 11.0619 16.9416 11.0615 15.6377V13.4229C11.0615 12.1186 12.1186 11.0615 13.4229 11.0615H15.6377ZM13.4229 12.5615C12.9471 12.5615 12.5615 12.9471 12.5615 13.4229V15.6377C12.5619 16.1132 12.9473 16.498 13.4229 16.498H15.6377C16.113 16.4978 16.4977 16.113 16.498 15.6377V13.4229C16.498 12.9472 16.1133 12.5618 15.6377 12.5615H13.4229Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M6.57617 2C7.88017 2.0002 8.93645 3.0573 8.93652 4.36133V6.57617C8.93633 7.8801 7.8801 8.93633 6.57617 8.93652H4.36133C3.05734 8.9364 2.0002 7.88014 2 6.57617V4.36133C2.00007 3.05725 3.05726 2.00012 4.36133 2H6.57617ZM4.36133 3.5C3.88569 3.50012 3.50007 3.88568 3.5 4.36133V6.57617C3.5002 7.05172 3.88577 7.4364 4.36133 7.43652H6.57617C7.05167 7.43633 7.43633 7.05167 7.43652 6.57617V4.36133C7.43645 3.88572 7.05175 3.5002 6.57617 3.5H4.36133Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M15.6377 2C16.9416 2.00026 17.998 3.05734 17.998 4.36133V6.57617C17.9978 7.88006 16.9416 8.93626 15.6377 8.93652H13.4229C12.1188 8.93652 11.0617 7.88022 11.0615 6.57617V4.36133C11.0616 3.05718 12.1187 2 13.4229 2H15.6377ZM13.4229 3.5C12.9471 3.5 12.5616 3.8856 12.5615 4.36133V6.57617C12.5617 7.05179 12.9472 7.43652 13.4229 7.43652H15.6377C16.1131 7.43626 16.4978 7.05163 16.498 6.57617V4.36133C16.498 3.88576 16.1132 3.50026 15.6377 3.5H13.4229Z"), + ) + }.build() + return _ic_grid_20!! + } + +@Composable +@Preview(showBackground = true) +private fun IcGrid20Preview() { + Icon( + imageVector = Icons.ic_grid_20, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGrid24.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGrid24.kt new file mode 100644 index 0000000000..bb4eaed8a7 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGrid24.kt @@ -0,0 +1,62 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_grid_24: ImageVector? = null + +val Icons.ic_grid_24: ImageVector + get() { + if (_ic_grid_24 != null) return _ic_grid_24!! + _ic_grid_24 = ImageVector.Builder( + name = "ic_grid_24", + defaultWidth = 24.dp, + defaultHeight = 24.dp, + viewportWidth = 24f, + viewportHeight = 24f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M7.74902 13.249C9.40615 13.249 10.749 14.5919 10.749 16.249V18.998C10.7488 20.6551 9.40603 21.998 7.74902 21.998H5C3.34319 21.9978 2.00018 20.6549 2 18.998V16.249C2 14.592 3.34308 13.2493 5 13.249H7.74902ZM5 15.249C4.44756 15.2493 4 15.6967 4 16.249V18.998C4.00018 19.5502 4.44767 19.9978 5 19.998H7.74902C8.30156 19.998 8.74884 19.5504 8.74902 18.998V16.249C8.74902 15.6965 8.30167 15.249 7.74902 15.249H5Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M18.998 13.249C20.6552 13.249 21.998 14.5919 21.998 16.249V18.998C21.9979 20.6551 20.6551 21.998 18.998 21.998H16.249C14.5921 21.9979 13.2492 20.655 13.249 18.998V16.249C13.249 14.5919 14.592 13.2491 16.249 13.249H18.998ZM16.249 15.249C15.6965 15.2491 15.249 15.6966 15.249 16.249V18.998C15.2492 19.5503 15.6966 19.9979 16.249 19.998H18.998C19.5506 19.998 19.9979 19.5504 19.998 18.998V16.249C19.998 15.6965 19.5507 15.249 18.998 15.249H16.249Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M7.74902 2C9.40602 2 10.7488 3.34302 10.749 5V7.74902C10.749 9.40619 9.40615 10.749 7.74902 10.749H5C3.34308 10.7488 2 9.40604 2 7.74902V5C2.00021 3.34317 3.34321 2.00024 5 2H7.74902ZM5 4C4.44769 4.00024 4.00021 4.44783 4 5V7.74902C4 8.30138 4.44756 8.74879 5 8.74902H7.74902C8.30167 8.74902 8.74902 8.30152 8.74902 7.74902V5C8.74881 4.44768 8.30154 4 7.74902 4H5Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M18.998 2C20.655 2 21.9978 3.34302 21.998 5V7.74902C21.998 9.40619 20.6552 10.749 18.998 10.749H16.249C14.592 10.7489 13.249 9.40612 13.249 7.74902V5C13.2492 3.34308 14.5921 2.00011 16.249 2H18.998ZM16.249 4C15.6966 4.00011 15.2492 4.44775 15.249 5V7.74902C15.249 8.30146 15.6965 8.74892 16.249 8.74902H18.998C19.5507 8.74902 19.998 8.30152 19.998 7.74902V5C19.9978 4.44768 19.5506 4 18.998 4H16.249Z"), + ) + }.build() + return _ic_grid_24!! + } + +@Composable +@Preview(showBackground = true) +private fun IcGrid24Preview() { + Icon( + imageVector = Icons.ic_grid_24, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGrid28.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGrid28.kt new file mode 100644 index 0000000000..6d46ea8a42 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGrid28.kt @@ -0,0 +1,62 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_grid_28: ImageVector? = null + +val Icons.ic_grid_28: ImageVector + get() { + if (_ic_grid_28 != null) return _ic_grid_28!! + _ic_grid_28 = ImageVector.Builder( + name = "ic_grid_28", + defaultWidth = 28.dp, + defaultHeight = 28.dp, + viewportWidth = 28f, + viewportHeight = 28f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M9.39648 15.1885C11.2838 15.1886 12.8124 16.7181 12.8125 18.6055V21.585C12.8123 23.4722 11.2837 25.0008 9.39648 25.001H6.41699C4.52965 25.0009 3.00017 23.4723 3 21.585V18.6055C3.00008 16.7181 4.5296 15.1886 6.41699 15.1885H9.39648ZM6.41699 17.6885C5.91031 17.6886 5.50008 18.0988 5.5 18.6055V21.585C5.50017 22.0916 5.91037 22.5009 6.41699 22.501H9.39648C9.90303 22.5008 10.3123 22.0915 10.3125 21.585V18.6055C10.3124 18.0988 9.90309 17.6886 9.39648 17.6885H6.41699Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M21.585 15.1885C23.4722 15.1887 25.0009 16.7182 25.001 18.6055V21.585C25.0008 23.4722 23.4721 25.0007 21.585 25.001H18.6055C16.7181 25.001 15.1887 23.4723 15.1885 21.585V18.6055C15.1886 16.718 16.718 15.1885 18.6055 15.1885H21.585ZM18.6055 17.6885C18.0987 17.6885 17.6886 18.0987 17.6885 18.6055V21.585C17.6887 22.0916 18.0988 22.501 18.6055 22.501H21.585C22.0914 22.5007 22.5008 22.0915 22.501 21.585V18.6055C22.5009 18.0989 22.0915 17.6887 21.585 17.6885H18.6055Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M9.39648 3C11.2837 3.00017 12.8123 4.52974 12.8125 6.41699V9.39648C12.8123 11.2837 11.2837 12.8123 9.39648 12.8125H6.41699C4.52965 12.8124 3.00017 11.2838 3 9.39648V6.41699C3.00018 4.52968 4.52966 3.00008 6.41699 3H9.39648ZM6.41699 5.5C5.91037 5.50008 5.50018 5.9104 5.5 6.41699V9.39648C5.50017 9.90309 5.91037 10.3124 6.41699 10.3125H9.39648C9.90303 10.3123 10.3123 9.90303 10.3125 9.39648V6.41699C10.3123 5.91045 9.90303 5.50017 9.39648 5.5H6.41699Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M21.585 3C23.4721 3.00026 25.0008 4.52979 25.001 6.41699V9.39648C25.0008 11.2837 23.4721 12.8122 21.585 12.8125H18.6055C16.7181 12.8125 15.1887 11.2839 15.1885 9.39648V6.41699C15.1887 4.52963 16.7181 3 18.6055 3H21.585ZM18.6055 5.5C18.0988 5.5 17.6887 5.91034 17.6885 6.41699V9.39648C17.6887 9.90314 18.0988 10.3125 18.6055 10.3125H21.585C22.0914 10.3122 22.5008 9.90298 22.501 9.39648V6.41699C22.5008 5.9105 22.0914 5.50026 21.585 5.5H18.6055Z"), + ) + }.build() + return _ic_grid_28!! + } + +@Composable +@Preview(showBackground = true) +private fun IcGrid28Preview() { + Icon( + imageVector = Icons.ic_grid_28, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGridPlus16.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGridPlus16.kt new file mode 100644 index 0000000000..32d787d6cb --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGridPlus16.kt @@ -0,0 +1,62 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_grid_plus_16: ImageVector? = null + +val Icons.ic_grid_plus_16: ImageVector + get() { + if (_ic_grid_plus_16 != null) return _ic_grid_plus_16!! + _ic_grid_plus_16 = ImageVector.Builder( + name = "ic_grid_plus_16", + defaultWidth = 16.dp, + defaultHeight = 16.dp, + viewportWidth = 16f, + viewportHeight = 16f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M5.61133 8.56934C6.61611 8.56962 7.43047 9.38387 7.43066 10.3887V12.1807C7.43063 13.1856 6.61621 13.9997 5.61133 14H3.81934C2.81429 13.9999 2.00003 13.1857 2 12.1807V10.3887C2.00019 9.38375 2.81439 8.56943 3.81934 8.56934H5.61133ZM3.81934 9.81934C3.50475 9.81943 3.25019 10.0741 3.25 10.3887V12.1807C3.25003 12.4954 3.50465 12.7499 3.81934 12.75H5.61133C5.92585 12.7497 6.18063 12.4953 6.18066 12.1807V10.3887C6.18047 10.0742 5.92575 9.81962 5.61133 9.81934H3.81934Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M11.2852 9.16699C11.6301 9.16722 11.9102 9.44696 11.9102 9.79199V10.6602H12.7783C13.1233 10.6604 13.4033 10.9401 13.4033 11.2852C13.4032 11.6301 13.1232 11.9099 12.7783 11.9102H11.9102V12.7783C11.91 13.1232 11.63 13.4031 11.2852 13.4033C10.9401 13.4033 10.6603 13.1234 10.6602 12.7783V11.9102H9.79199C9.4469 11.9102 9.16713 11.6302 9.16699 11.2852C9.16699 10.94 9.44681 10.6602 9.79199 10.6602H10.6602V9.79199C10.6602 9.44681 10.94 9.16699 11.2852 9.16699Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M5.61133 2C6.61617 2.00028 7.43057 2.81445 7.43066 3.81934V5.61133C7.43048 6.61614 6.61612 7.43038 5.61133 7.43066H3.81934C2.81438 7.43057 2.00018 6.61626 2 5.61133V3.81934C2.00009 2.81433 2.81433 2.00009 3.81934 2H5.61133ZM3.81934 3.25C3.50469 3.25009 3.25009 3.50468 3.25 3.81934V5.61133C3.25018 5.9259 3.50474 6.18057 3.81934 6.18066H5.61133C5.92576 6.18038 6.18048 5.92579 6.18066 5.61133V3.81934C6.18057 3.5048 5.92582 3.25028 5.61133 3.25H3.81934Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M12.1807 2C13.1857 2.00003 13.9999 2.81429 14 3.81934V5.61133C13.9998 6.6163 13.1857 7.43063 12.1807 7.43066H10.3887C9.38377 7.43052 8.56952 6.61623 8.56934 5.61133V3.81934C8.56943 2.81436 9.38371 2.00015 10.3887 2H12.1807ZM10.3887 3.25C10.0741 3.25015 9.81943 3.50472 9.81934 3.81934V5.61133C9.81952 5.92587 10.0741 6.18052 10.3887 6.18066H12.1807C12.4953 6.18063 12.7498 5.92594 12.75 5.61133V3.81934C12.7499 3.50465 12.4954 3.25003 12.1807 3.25H10.3887Z"), + ) + }.build() + return _ic_grid_plus_16!! + } + +@Composable +@Preview(showBackground = true) +private fun IcGridPlus16Preview() { + Icon( + imageVector = Icons.ic_grid_plus_16, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGridPlus20.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGridPlus20.kt new file mode 100644 index 0000000000..0517db1ea0 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGridPlus20.kt @@ -0,0 +1,62 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_grid_plus_20: ImageVector? = null + +val Icons.ic_grid_plus_20: ImageVector + get() { + if (_ic_grid_plus_20 != null) return _ic_grid_plus_20!! + _ic_grid_plus_20 = ImageVector.Builder( + name = "ic_grid_plus_20", + defaultWidth = 20.dp, + defaultHeight = 20.dp, + viewportWidth = 20f, + viewportHeight = 20f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M6.77734 10.8604C8.08152 10.8604 9.1377 11.9175 9.1377 13.2217V15.6377C9.1374 16.9416 8.08134 17.998 6.77734 17.998H4.36133C3.05738 17.9979 2.00029 16.9416 2 15.6377V13.2217C2 11.9175 3.0572 10.8605 4.36133 10.8604H6.77734ZM4.36133 12.3604C3.88563 12.3605 3.5 12.746 3.5 13.2217V15.6377C3.50029 16.1132 3.88581 16.4979 4.36133 16.498H6.77734C7.25292 16.498 7.63741 16.1132 7.6377 15.6377V13.2217C7.6377 12.7459 7.2531 12.3604 6.77734 12.3604H4.36133Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M14.4287 11.665C14.8427 11.6652 15.1785 12.001 15.1787 12.415V13.6787H16.4424C16.8564 13.6788 17.1922 14.0147 17.1924 14.4287C17.1923 14.8428 16.8565 15.1786 16.4424 15.1787H15.1787V16.4424C15.1787 16.8565 14.8428 17.1923 14.4287 17.1924C14.0147 17.1922 13.6788 16.8564 13.6787 16.4424V15.1787H12.415C12.0009 15.1786 11.6651 14.8428 11.665 14.4287C11.6652 14.0147 12.001 13.6788 12.415 13.6787H13.6787V12.415C13.6789 12.0011 14.0148 11.6652 14.4287 11.665Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M6.77734 2C8.08152 2.00006 9.13769 3.05714 9.1377 4.36133V6.77734C9.13764 8.08149 8.08149 9.13763 6.77734 9.1377H4.36133C3.05724 9.13757 2.00006 8.08145 2 6.77734V4.36133C2.00001 3.05718 3.05721 2.00012 4.36133 2H6.77734ZM4.36133 3.5C3.88564 3.50012 3.50001 3.88561 3.5 4.36133V6.77734C3.50006 7.25302 3.88567 7.63757 4.36133 7.6377H6.77734C7.25306 7.63763 7.63764 7.25306 7.6377 6.77734V4.36133C7.63769 3.88557 7.25309 3.50006 6.77734 3.5H4.36133Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M15.6377 2C16.9418 2.00013 17.998 3.05719 17.998 4.36133V6.77734C17.998 8.08144 16.9418 9.13756 15.6377 9.1377H13.2217C11.9175 9.1377 10.8604 8.08153 10.8604 6.77734V4.36133C10.8604 3.0571 11.9175 2 13.2217 2H15.6377ZM13.2217 3.5C12.7459 3.5 12.3604 3.88553 12.3604 4.36133V6.77734C12.3604 7.2531 12.7459 7.6377 13.2217 7.6377H15.6377C16.1133 7.63756 16.498 7.25302 16.498 6.77734V4.36133C16.498 3.88561 16.1134 3.50013 15.6377 3.5H13.2217Z"), + ) + }.build() + return _ic_grid_plus_20!! + } + +@Composable +@Preview(showBackground = true) +private fun IcGridPlus20Preview() { + Icon( + imageVector = Icons.ic_grid_plus_20, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGridPlus24.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGridPlus24.kt new file mode 100644 index 0000000000..3f52fdb61e --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGridPlus24.kt @@ -0,0 +1,62 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_grid_plus_24: ImageVector? = null + +val Icons.ic_grid_plus_24: ImageVector + get() { + if (_ic_grid_plus_24 != null) return _ic_grid_plus_24!! + _ic_grid_plus_24 = ImageVector.Builder( + name = "ic_grid_plus_24", + defaultWidth = 24.dp, + defaultHeight = 24.dp, + viewportWidth = 24f, + viewportHeight = 24f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M8 13C9.65728 13 11 14.3427 11 16V19C11 20.6573 9.65728 22 8 22H5C3.34272 22 2 20.6573 2 19V16C2 14.3427 3.34272 13 5 13H8ZM5 15C4.44728 15 4 15.4473 4 16V19C4 19.5527 4.44728 20 5 20H8C8.55272 20 9 19.5527 9 19V16C9 15.4473 8.55272 15 8 15H5Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M17.5 14C18.0523 14 18.5 14.4477 18.5 15V16.5H20C20.5523 16.5 21 16.9477 21 17.5C21 18.0523 20.5523 18.5 20 18.5H18.5V20C18.5 20.5523 18.0523 21 17.5 21C16.9477 21 16.5 20.5523 16.5 20V18.5H15C14.4477 18.5 14 18.0523 14 17.5C14 16.9477 14.4477 16.5 15 16.5H16.5V15C16.5 14.4477 16.9477 14 17.5 14Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M8 2C9.65728 2 11 3.34272 11 5V8C11 9.65728 9.65728 11 8 11H5C3.34272 11 2 9.65728 2 8V5C2 3.34272 3.34272 2 5 2H8ZM5 4C4.44728 4 4 4.44728 4 5V8C4 8.55272 4.44728 9 5 9H8C8.55272 9 9 8.55272 9 8V5C9 4.44728 8.55272 4 8 4H5Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M19 2C20.6573 2 22 3.34272 22 5V8C22 9.65728 20.6573 11 19 11H16C14.3427 11 13 9.65728 13 8V5C13 3.34272 14.3427 2 16 2H19ZM16 4C15.4473 4 15 4.44728 15 5V8C15 8.55272 15.4473 9 16 9H19C19.5527 9 20 8.55272 20 8V5C20 4.44728 19.5527 4 19 4H16Z"), + ) + }.build() + return _ic_grid_plus_24!! + } + +@Composable +@Preview(showBackground = true) +private fun IcGridPlus24Preview() { + Icon( + imageVector = Icons.ic_grid_plus_24, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGridPlus28.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGridPlus28.kt new file mode 100644 index 0000000000..b81d3c22f4 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcGridPlus28.kt @@ -0,0 +1,62 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_grid_plus_28: ImageVector? = null + +val Icons.ic_grid_plus_28: ImageVector + get() { + if (_ic_grid_plus_28 != null) return _ic_grid_plus_28!! + _ic_grid_plus_28 = ImageVector.Builder( + name = "ic_grid_plus_28", + defaultWidth = 28.dp, + defaultHeight = 28.dp, + viewportWidth = 28f, + viewportHeight = 28f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M9.66699 14.918C11.5545 14.918 13.084 16.4474 13.084 18.335V21.585C13.0839 23.4725 11.5545 25.0019 9.66699 25.002H6.41699C4.52948 25.002 3.00007 23.4725 3 21.585V18.335C3 16.4474 4.52944 14.918 6.41699 14.918H9.66699ZM6.41699 17.418C5.91015 17.418 5.5 17.8281 5.5 18.335V21.585C5.50007 22.0917 5.91019 22.502 6.41699 22.502H9.66699C10.1738 22.5019 10.5839 22.0917 10.584 21.585V18.335C10.584 17.8281 10.1738 17.418 9.66699 17.418H6.41699Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M19.96 16.001C20.6501 16.0011 21.2098 16.5609 21.21 17.251V18.71H22.668C23.3583 18.71 23.9179 19.2697 23.918 19.96C23.9178 20.6502 23.3582 21.21 22.668 21.21H21.21V22.668C21.21 23.3582 20.6502 23.9178 19.96 23.918C19.2696 23.9179 18.71 23.3583 18.71 22.668V21.21H17.251C16.5609 21.2098 16.0011 20.6501 16.001 19.96C16.0011 19.2698 16.5608 18.7101 17.251 18.71H18.71V17.251C18.7101 16.5608 19.2697 16.001 19.96 16.001Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M9.66699 3C11.5545 3.00001 13.084 4.52945 13.084 6.41699V9.66699C13.084 11.5545 11.5545 13.084 9.66699 13.084H6.41699C4.52944 13.084 3 11.5545 3 9.66699V6.41699C3.00001 4.52945 4.52944 3 6.41699 3H9.66699ZM6.41699 5.5C5.91016 5.5 5.50001 5.91016 5.5 6.41699V9.66699C5.5 10.1738 5.91015 10.584 6.41699 10.584H9.66699C10.1738 10.584 10.584 10.1738 10.584 9.66699V6.41699C10.584 5.91017 10.1738 5.50001 9.66699 5.5H6.41699Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M21.585 3C23.4724 3.00014 25.0019 4.52954 25.002 6.41699V9.66699C25.002 11.5545 23.4724 13.0838 21.585 13.084H18.335C16.4474 13.084 14.918 11.5545 14.918 9.66699V6.41699C14.918 4.52945 16.4474 3 18.335 3H21.585ZM18.335 5.5C17.8281 5.5 17.418 5.91016 17.418 6.41699V9.66699C17.418 10.1738 17.8281 10.584 18.335 10.584H21.585C22.0917 10.5838 22.502 10.1737 22.502 9.66699V6.41699C22.5019 5.91025 22.0917 5.50014 21.585 5.5H18.335Z"), + ) + }.build() + return _ic_grid_plus_28!! + } + +@Composable +@Preview(showBackground = true) +private fun IcGridPlus28Preview() { + Icon( + imageVector = Icons.ic_grid_plus_28, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcHeart16.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcHeart16.kt index dcb0a7ee63..62f84bdc35 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcHeart16.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcHeart16.kt @@ -31,7 +31,7 @@ val Icons.ic_heart_16: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M10.2119 2.5C12.5521 2.50031 14.0029 4.70655 14.0029 6.63379C14.0028 7.65361 13.6105 8.59271 13.0713 9.40234C12.5316 10.2126 11.8223 10.9278 11.1299 11.5156C10.435 12.1054 9.73935 12.5815 9.21191 12.9102C8.94794 13.0746 8.72349 13.2043 8.55859 13.2939C8.47673 13.3385 8.40636 13.3747 8.35156 13.4014C8.32501 13.4143 8.29574 13.4279 8.26855 13.4395C8.25576 13.4449 8.23542 13.4529 8.21191 13.4609C8.20024 13.4649 8.18004 13.4714 8.15527 13.4775C8.14029 13.4813 8.07935 13.497 8.00098 13.4971C7.92349 13.497 7.8634 13.4815 7.84766 13.4775C7.82308 13.4714 7.80276 13.4649 7.79102 13.4609C7.76739 13.4529 7.74624 13.4449 7.7334 13.4395C7.70641 13.428 7.67774 13.4142 7.65137 13.4014C7.59665 13.3747 7.52608 13.3384 7.44434 13.2939C7.27944 13.2043 7.05403 13.0746 6.79004 12.9102C6.26273 12.5816 5.56768 12.1052 4.87305 11.5156C4.18068 10.9279 3.47133 10.2124 2.93164 9.40234C2.39241 8.59271 2.0001 7.65361 2 6.63379C2.00005 4.70644 3.45057 2.50005 5.79102 2.5C6.76206 2.50006 7.48919 2.86673 8.00098 3.29004C8.51283 2.86653 9.24045 2.5 10.2119 2.5ZM10.2119 3.75C9.3646 3.75 8.81364 4.17408 8.47852 4.57031C8.35982 4.71056 8.18471 4.79192 8.00098 4.79199C7.81744 4.79187 7.64307 4.71032 7.52441 4.57031C7.18932 4.17412 6.63819 3.75008 5.79102 3.75C4.34424 3.75005 3.25005 5.1742 3.25 6.63379C3.2501 7.32849 3.51797 8.02773 3.97168 8.70898C4.42501 9.38953 5.04224 10.0197 5.68164 10.5625C6.31859 11.1031 6.96175 11.5436 7.45117 11.8486C7.67273 11.9867 7.86195 12.0952 8.00098 12.1719C8.14011 12.0951 8.3288 11.9869 8.55078 11.8486C9.04033 11.5436 9.68405 11.1034 10.3213 10.5625C10.9607 10.0197 11.5779 9.38958 12.0312 8.70898C12.4849 8.02775 12.7528 7.32847 12.7529 6.63379C12.7529 5.17434 11.6585 3.75032 10.2119 3.75Z"), + pathData = addPathNodes("M10.2119 2.5C12.5521 2.50031 14.0029 4.70655 14.0029 6.63379C14.0028 7.65361 13.6105 8.59271 13.0713 9.40234C12.5316 10.2126 11.8223 10.9278 11.1299 11.5156C10.435 12.1054 9.73935 12.5815 9.21191 12.9102C8.94794 13.0746 8.72349 13.2043 8.55859 13.2939C8.47673 13.3385 8.40636 13.3747 8.35156 13.4014C8.32501 13.4143 8.29574 13.4279 8.26855 13.4395C8.25576 13.4449 8.23542 13.4529 8.21191 13.4609C8.20024 13.4649 8.18004 13.4714 8.15527 13.4775C8.14029 13.4813 8.07935 13.497 8.00098 13.4971C7.92349 13.497 7.8634 13.4815 7.84766 13.4775C7.82308 13.4714 7.80276 13.4649 7.79102 13.4609C7.76739 13.4529 7.74624 13.4449 7.7334 13.4395C7.70641 13.428 7.67774 13.4142 7.65137 13.4014C7.59665 13.3747 7.52608 13.3384 7.44434 13.2939C7.27944 13.2043 7.05403 13.0746 6.79004 12.9102C6.26273 12.5816 5.56768 12.1052 4.87305 11.5156C4.18068 10.9279 3.47133 10.2124 2.93164 9.40234C2.39241 8.59271 2.0001 7.65361 2 6.63379C2.00005 4.70644 3.45057 2.50005 5.79102 2.5C6.76206 2.50006 7.48919 2.86673 8.00098 3.29004C8.51283 2.86653 9.24045 2.5 10.2119 2.5ZM10.2119 3.75C9.3646 3.75 8.81364 4.17408 8.47852 4.57031C8.35982 4.71056 8.18471 4.79192 8.00098 4.79199C7.81744 4.79187 7.64307 4.71032 7.52441 4.57031C7.18932 4.17412 6.63819 3.75008 5.79102 3.75C4.34424 3.75005 3.25005 5.1742 3.25 6.63379C3.2501 7.32849 3.51797 8.02773 3.97168 8.70898C4.42501 9.38953 5.04224 10.0197 5.68164 10.5625C6.31859 11.1031 6.96175 11.5436 7.45117 11.8486C7.67273 11.9867 7.86195 12.0952 8.00098 12.1719C8.14011 12.0951 8.3288 11.9869 8.55078 11.8486C9.04033 11.5436 9.68405 11.1034 10.3213 10.5625C10.9607 10.0197 11.5779 9.38958 12.0312 8.70898C12.4849 8.02775 12.7528 7.32846 12.7529 6.63379C12.7529 5.17434 11.6585 3.75032 10.2119 3.75Z"), ) }.build() return _ic_heart_16!! diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcHeart28.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcHeart28.kt new file mode 100644 index 0000000000..245b7073a5 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcHeart28.kt @@ -0,0 +1,47 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_heart_28: ImageVector? = null + +val Icons.ic_heart_28: ImageVector + get() { + if (_ic_heart_28 != null) return _ic_heart_28!! + _ic_heart_28 = ImageVector.Builder( + name = "ic_heart_28", + defaultWidth = 28.dp, + defaultHeight = 28.dp, + viewportWidth = 28f, + viewportHeight = 28f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M18.4189 3.5C23.043 3.5 25.999 7.66221 25.999 11.4092C25.9989 13.379 25.2017 15.181 24.1201 16.7227C23.0366 18.2667 21.615 19.6276 20.2305 20.7432C18.8407 21.8628 17.4505 22.7663 16.3965 23.3896C15.8687 23.7018 15.4192 23.9472 15.0898 24.1172C14.9263 24.2016 14.7858 24.2708 14.6768 24.3213C14.6239 24.3457 14.5671 24.3711 14.5137 24.3926C14.4884 24.4027 14.4483 24.4177 14.4023 24.4326C14.3796 24.44 14.3404 24.4527 14.293 24.4639C14.263 24.4709 14.1481 24.498 14 24.498C13.851 24.498 13.7352 24.4707 13.7061 24.4639C13.6586 24.4527 13.6204 24.44 13.5977 24.4326C13.5514 24.4176 13.5106 24.4027 13.4854 24.3926C13.4319 24.3711 13.3751 24.3457 13.3223 24.3213C13.2132 24.2708 13.0728 24.2016 12.9092 24.1172C12.5799 23.9472 12.1311 23.7017 11.6035 23.3896C10.5494 22.7662 9.15845 21.863 7.76855 20.7432C6.38398 19.6276 4.9634 18.2668 3.87988 16.7227C2.79814 15.181 2.00013 13.3791 2 11.4092C2.00004 7.66234 4.95627 3.50031 9.58008 3.5C11.5194 3.5 12.9731 4.2018 13.999 5.01465C15.0249 4.20158 16.4793 3.50006 18.4189 3.5ZM18.4189 6C16.6992 6.00008 15.5931 6.81735 14.9326 7.55859C14.6955 7.82435 14.3561 7.97646 14 7.97656C13.6436 7.97649 13.3035 7.8246 13.0664 7.55859C12.4059 6.81731 11.3 6 9.58008 6C6.63197 6.00032 4.50004 8.72832 4.5 11.4092C4.50013 12.6933 5.02207 13.9991 5.92578 15.2871C6.82793 16.5728 8.05909 17.7655 9.33789 18.7959C10.6114 19.822 11.8967 20.6581 12.876 21.2373C13.333 21.5076 13.7192 21.7179 14 21.8643C14.2807 21.7179 14.6675 21.5073 15.124 21.2373C16.1032 20.6581 17.3888 19.8218 18.6621 18.7959C19.9407 17.7657 21.1712 16.5726 22.0732 15.2871C22.977 13.9991 23.4989 12.6933 23.499 11.4092C23.499 8.72817 21.3673 6 18.4189 6Z"), + ) + }.build() + return _ic_heart_28!! + } + +@Composable +@Preview(showBackground = true) +private fun IcHeart28Preview() { + Icon( + imageVector = Icons.ic_heart_28, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcHeart28Filled.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcHeart28Filled.kt new file mode 100644 index 0000000000..ddda047d1d --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcHeart28Filled.kt @@ -0,0 +1,47 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_heart_28_filled: ImageVector? = null + +val Icons.ic_heart_28_filled: ImageVector + get() { + if (_ic_heart_28_filled != null) return _ic_heart_28_filled!! + _ic_heart_28_filled = ImageVector.Builder( + name = "ic_heart_28_filled", + defaultWidth = 28.dp, + defaultHeight = 28.dp, + viewportWidth = 28f, + viewportHeight = 28f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M18.9328 3.49902C23.1595 3.49902 25.9995 7.41027 25.9995 11.059C25.9995 18.4484 14.2128 24.499 13.9995 24.499C13.7862 24.499 1.99951 18.4484 1.99951 11.059C1.99951 7.41027 4.83951 3.49902 9.06618 3.49902C11.4928 3.49902 13.0795 4.6934 13.9995 5.7434C14.9195 4.6934 16.5062 3.49902 18.9328 3.49902Z"), + ) + }.build() + return _ic_heart_28_filled!! + } + +@Composable +@Preview(showBackground = true) +private fun IcHeart28FilledPreview() { + Icon( + imageVector = Icons.ic_heart_28_filled, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcHeart32.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcHeart32.kt index 97b92fa41e..690b65e389 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcHeart32.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcHeart32.kt @@ -31,7 +31,7 @@ val Icons.ic_heart_32: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M20.834 4.5C25.8256 4.50032 29.0046 9.05209 29.0049 13.1299C29.0048 15.2713 28.1491 17.2402 26.9756 18.9355C25.8006 20.633 24.2568 22.1319 22.748 23.3643C21.2341 24.6008 19.7184 25.5981 18.5693 26.2871C17.9941 26.632 17.5046 26.9034 17.1465 27.0908C16.9686 27.1839 16.8166 27.2594 16.6992 27.3145C16.6423 27.3411 16.5824 27.3688 16.5264 27.3916C16.4999 27.4024 16.4584 27.418 16.4111 27.4336C16.3879 27.4412 16.3481 27.4542 16.2998 27.4658C16.2696 27.4731 16.1523 27.5009 16.002 27.501C15.8526 27.5009 15.7363 27.4733 15.7051 27.4658C15.657 27.4543 15.6171 27.4413 15.5938 27.4336C15.5467 27.4181 15.5051 27.4024 15.4785 27.3916C15.4226 27.3688 15.3625 27.3411 15.3057 27.3145C15.1884 27.2595 15.0361 27.1838 14.8584 27.0908C14.5003 26.9035 14.0107 26.6319 13.4355 26.2871C12.2866 25.5982 10.7707 24.6007 9.25684 23.3643C7.74815 22.132 6.20426 20.6328 5.0293 18.9355C3.8558 17.2402 3.00012 15.2713 3 13.1299C3.00024 9.05194 6.17897 4.5 11.1709 4.5C13.306 4.50013 14.8942 5.29749 16.002 6.20703C17.1098 5.29726 18.6983 4.5 20.834 4.5ZM20.834 7C18.9179 7 17.6812 7.92499 16.9414 8.7666C16.7042 9.03641 16.3612 9.19127 16.002 9.19141C15.6429 9.19128 15.3007 9.03609 15.0635 8.7666C14.3238 7.92506 13.0866 7.00017 11.1709 7C7.88427 7 5.50024 10.084 5.5 13.1299C5.50012 14.595 6.08771 16.0719 7.08496 17.5127C8.08079 18.9511 9.43611 20.282 10.8389 21.4277C12.2366 22.5693 13.6468 23.4997 14.7207 24.1436C15.248 24.4597 15.6898 24.7035 16.002 24.8672C16.3142 24.7034 16.7564 24.46 17.2842 24.1436C18.3582 23.4996 19.7682 22.5694 21.166 21.4277C22.5689 20.2819 23.9241 18.9513 24.9199 17.5127C25.9172 16.0719 26.5048 14.595 26.5049 13.1299C26.5046 10.0842 24.1203 7.00033 20.834 7Z"), + pathData = addPathNodes("M20.834 4.5C25.8256 4.50032 29.0046 9.05209 29.0049 13.1299C29.0048 15.2713 28.1491 17.2402 26.9756 18.9355C25.8006 20.633 24.2568 22.1319 22.748 23.3643C21.2341 24.6008 19.7184 25.5981 18.5693 26.2871C17.9941 26.632 17.5046 26.9034 17.1465 27.0908C16.9686 27.1839 16.8166 27.2594 16.6992 27.3145C16.6423 27.3411 16.5824 27.3688 16.5264 27.3916C16.4999 27.4024 16.4584 27.418 16.4111 27.4336C16.3879 27.4412 16.3481 27.4543 16.2998 27.4658C16.2696 27.4731 16.1523 27.5009 16.002 27.501C15.8526 27.5009 15.7363 27.4733 15.7051 27.4658C15.657 27.4543 15.6171 27.4413 15.5938 27.4336C15.5467 27.4181 15.5051 27.4024 15.4785 27.3916C15.4226 27.3688 15.3625 27.3411 15.3057 27.3145C15.1884 27.2595 15.0361 27.1838 14.8584 27.0908C14.5003 26.9035 14.0107 26.6319 13.4355 26.2871C12.2866 25.5982 10.7707 24.6007 9.25684 23.3643C7.74815 22.132 6.20426 20.6328 5.0293 18.9355C3.8558 17.2402 3.00012 15.2713 3 13.1299C3.00024 9.05194 6.17897 4.5 11.1709 4.5C13.306 4.50013 14.8942 5.29749 16.002 6.20703C17.1098 5.29726 18.6983 4.5 20.834 4.5ZM20.834 7C18.9179 7 17.6812 7.92499 16.9414 8.7666C16.7042 9.03641 16.3612 9.19127 16.002 9.19141C15.6429 9.19128 15.3007 9.03609 15.0635 8.7666C14.3238 7.92506 13.0866 7.00017 11.1709 7C7.88427 7 5.50024 10.084 5.5 13.1299C5.50012 14.595 6.08771 16.0719 7.08496 17.5127C8.08079 18.9511 9.43611 20.282 10.8389 21.4277C12.2366 22.5693 13.6468 23.4997 14.7207 24.1436C15.248 24.4597 15.6898 24.7035 16.002 24.8672C16.3142 24.7034 16.7564 24.46 17.2842 24.1436C18.3582 23.4996 19.7682 22.5694 21.166 21.4277C22.5689 20.2819 23.9241 18.9513 24.9199 17.5127C25.9172 16.0719 26.5048 14.595 26.5049 13.1299C26.5046 10.0842 24.1203 7.00033 20.834 7Z"), ) }.build() return _ic_heart_32!! diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcHeartBroken16.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcHeartBroken16.kt index 5d2319b1cc..94784125f9 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcHeartBroken16.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcHeartBroken16.kt @@ -31,7 +31,7 @@ val Icons.ic_heart_broken_16: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M10.2119 2.5C12.5521 2.50031 14.0029 4.70655 14.0029 6.63379C14.0028 7.65361 13.6105 8.59271 13.0713 9.40234C12.5316 10.2126 11.8223 10.9278 11.1299 11.5156C10.435 12.1054 9.73935 12.5815 9.21191 12.9102C8.94794 13.0746 8.72349 13.2043 8.55859 13.2939C8.47673 13.3385 8.40636 13.3747 8.35156 13.4014C8.32501 13.4143 8.29574 13.4279 8.26855 13.4395C8.25576 13.4449 8.23542 13.4529 8.21191 13.4609C8.20024 13.4649 8.18004 13.4714 8.15527 13.4775C8.14029 13.4813 8.07935 13.497 8.00098 13.4971C7.92349 13.497 7.8634 13.4815 7.84766 13.4775C7.82308 13.4714 7.80276 13.4649 7.79102 13.4609C7.76739 13.4529 7.74624 13.4449 7.7334 13.4395C7.70641 13.428 7.67774 13.4142 7.65137 13.4014C7.59665 13.3747 7.52608 13.3384 7.44434 13.2939C7.27944 13.2043 7.05403 13.0746 6.79004 12.9102C6.26273 12.5816 5.56768 12.1052 4.87305 11.5156C4.18068 10.9279 3.47133 10.2124 2.93164 9.40234C2.39241 8.59271 2.0001 7.65361 2 6.63379C2.00005 4.70644 3.45057 2.50005 5.79102 2.5C6.76206 2.50006 7.48919 2.86673 8.00098 3.29004C8.51283 2.86653 9.24045 2.5 10.2119 2.5ZM5.79102 3.75C4.34424 3.75005 3.25005 5.1742 3.25 6.63379C3.2501 7.32849 3.51797 8.02773 3.97168 8.70898C4.42501 9.38953 5.04224 10.0197 5.68164 10.5625C6.31859 11.1031 6.96175 11.5436 7.45117 11.8486C7.48253 11.8682 7.51395 11.886 7.54395 11.9043L8.2041 9.66016L6.91992 8.08887C6.73201 7.85885 6.73214 7.52794 6.91992 7.29785L8.16016 5.78027L7.60254 4.64453C7.57508 4.6216 7.54789 4.59802 7.52441 4.57031C7.18932 4.17412 6.63819 3.75008 5.79102 3.75ZM10.2119 3.75C9.5951 3.75 9.13554 3.97487 8.80176 4.25L9.45898 5.59082C9.56625 5.80992 9.53593 6.07166 9.38184 6.26074L8.21094 7.69238L9.38184 9.125C9.5123 9.28474 9.55517 9.49938 9.49707 9.69727L8.9375 11.5986C9.3564 11.3201 9.84091 10.9703 10.3213 10.5625C10.9607 10.0197 11.5779 9.38958 12.0312 8.70898C12.4849 8.02775 12.7528 7.32847 12.7529 6.63379C12.7529 5.17434 11.6585 3.75032 10.2119 3.75Z"), + pathData = addPathNodes("M10.2119 2.5C12.5521 2.50031 14.0029 4.70655 14.0029 6.63379C14.0028 7.65361 13.6105 8.59271 13.0713 9.40234C12.5316 10.2126 11.8223 10.9278 11.1299 11.5156C10.435 12.1054 9.73935 12.5815 9.21191 12.9102C8.94794 13.0746 8.72349 13.2043 8.55859 13.2939C8.47673 13.3385 8.40636 13.3747 8.35156 13.4014C8.32501 13.4143 8.29574 13.4279 8.26855 13.4395C8.25576 13.4449 8.23542 13.4529 8.21191 13.4609C8.20024 13.4649 8.18004 13.4714 8.15527 13.4775C8.14029 13.4813 8.07935 13.497 8.00098 13.4971C7.92349 13.497 7.8634 13.4815 7.84766 13.4775C7.82308 13.4714 7.80276 13.4649 7.79102 13.4609C7.76739 13.4529 7.74624 13.4449 7.7334 13.4395C7.70641 13.428 7.67774 13.4142 7.65137 13.4014C7.59665 13.3747 7.52608 13.3384 7.44434 13.2939C7.27944 13.2043 7.05403 13.0746 6.79004 12.9102C6.26273 12.5816 5.56768 12.1052 4.87305 11.5156C4.18068 10.9279 3.47133 10.2124 2.93164 9.40234C2.39241 8.59271 2.0001 7.65361 2 6.63379C2.00005 4.70644 3.45057 2.50005 5.79102 2.5C6.76206 2.50006 7.48919 2.86673 8.00098 3.29004C8.51283 2.86653 9.24045 2.5 10.2119 2.5ZM5.79102 3.75C4.34424 3.75005 3.25005 5.1742 3.25 6.63379C3.2501 7.32849 3.51797 8.02773 3.97168 8.70898C4.42501 9.38953 5.04224 10.0197 5.68164 10.5625C6.31859 11.1031 6.96175 11.5436 7.45117 11.8486C7.48253 11.8682 7.51395 11.886 7.54395 11.9043L8.2041 9.66016L6.91992 8.08887C6.73201 7.85885 6.73214 7.52794 6.91992 7.29785L8.16016 5.78027L7.60254 4.64453C7.57508 4.6216 7.54789 4.59802 7.52441 4.57031C7.18932 4.17412 6.63819 3.75008 5.79102 3.75ZM10.2119 3.75C9.5951 3.75 9.13554 3.97487 8.80176 4.25L9.45898 5.59082C9.56625 5.80992 9.53593 6.07166 9.38184 6.26074L8.21094 7.69238L9.38184 9.125C9.5123 9.28474 9.55517 9.49938 9.49707 9.69727L8.9375 11.5986C9.3564 11.3201 9.84091 10.9703 10.3213 10.5625C10.9607 10.0197 11.5779 9.38958 12.0312 8.70898C12.4849 8.02775 12.7528 7.32846 12.7529 6.63379C12.7529 5.17434 11.6585 3.75032 10.2119 3.75Z"), ) }.build() return _ic_heart_broken_16!! diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcHeartBroken28.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcHeartBroken28.kt new file mode 100644 index 0000000000..1ced68ea96 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcHeartBroken28.kt @@ -0,0 +1,47 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_heart_broken_28: ImageVector? = null + +val Icons.ic_heart_broken_28: ImageVector + get() { + if (_ic_heart_broken_28 != null) return _ic_heart_broken_28!! + _ic_heart_broken_28 = ImageVector.Builder( + name = "ic_heart_broken_28", + defaultWidth = 28.dp, + defaultHeight = 28.dp, + viewportWidth = 28f, + viewportHeight = 28f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M18.4189 3.5C23.043 3.5 25.999 7.66221 25.999 11.4092C25.9989 13.379 25.2017 15.181 24.1201 16.7227C23.0366 18.2667 21.615 19.6276 20.2305 20.7432C18.8407 21.8628 17.4505 22.7663 16.3965 23.3896C15.8687 23.7018 15.4192 23.9472 15.0898 24.1172C14.9263 24.2016 14.7858 24.2708 14.6768 24.3213C14.6239 24.3457 14.5671 24.3711 14.5137 24.3926C14.4884 24.4027 14.4483 24.4177 14.4023 24.4326C14.3796 24.44 14.3404 24.4527 14.293 24.4639C14.263 24.4709 14.1481 24.498 14 24.498C13.851 24.498 13.7352 24.4707 13.7061 24.4639C13.6586 24.4527 13.6204 24.44 13.5977 24.4326C13.5514 24.4176 13.5106 24.4027 13.4854 24.3926C13.4319 24.3711 13.3751 24.3457 13.3223 24.3213C13.2132 24.2708 13.0728 24.2016 12.9092 24.1172C12.5799 23.9472 12.1311 23.7017 11.6035 23.3896C10.5494 22.7662 9.15845 21.863 7.76855 20.7432C6.38398 19.6276 4.9634 18.2668 3.87988 16.7227C2.79814 15.181 2.00013 13.3791 2 11.4092C2.00004 7.66234 4.95627 3.50031 9.58008 3.5C11.5194 3.5 12.9731 4.2018 13.999 5.01465C15.0249 4.20158 16.4793 3.50006 18.4189 3.5ZM9.58008 6C6.63197 6.00032 4.50004 8.72832 4.5 11.4092C4.50013 12.6933 5.02207 13.9991 5.92578 15.2871C6.82793 16.5728 8.05909 17.7655 9.33789 18.7959C10.6114 19.822 11.8967 20.6581 12.876 21.2373C12.9504 21.2813 13.0242 21.3215 13.0947 21.3623L14.3916 17.1787L11.8584 14.2354C11.4552 13.7666 11.455 13.0732 11.8584 12.6045L14.293 9.77539L13.2217 7.70215C13.1668 7.65843 13.1138 7.61172 13.0664 7.55859C12.4059 6.81731 11.3 6 9.58008 6ZM18.4189 6C17.2003 6.00005 16.29 6.41016 15.6279 6.91309L16.9014 9.37793C17.1353 9.83082 17.0707 10.3812 16.7383 10.7676L14.4541 13.4199L16.7383 16.0732C17.019 16.3994 17.1126 16.8477 16.9854 17.2588L15.8984 20.7617C16.7354 20.2329 17.7026 19.569 18.6621 18.7959C19.9407 17.7657 21.1712 16.5726 22.0732 15.2871C22.977 13.9991 23.4989 12.6933 23.499 11.4092C23.499 8.72817 21.3673 6 18.4189 6Z"), + ) + }.build() + return _ic_heart_broken_28!! + } + +@Composable +@Preview(showBackground = true) +private fun IcHeartBroken28Preview() { + Icon( + imageVector = Icons.ic_heart_broken_28, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcInfo28.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcInfo28.kt new file mode 100644 index 0000000000..e2a28e9383 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcInfo28.kt @@ -0,0 +1,57 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_info_28: ImageVector? = null + +val Icons.ic_info_28: ImageVector + get() { + if (_ic_info_28 != null) return _ic_info_28!! + _ic_info_28 = ImageVector.Builder( + name = "ic_info_28", + defaultWidth = 28.dp, + defaultHeight = 28.dp, + viewportWidth = 28f, + viewportHeight = 28f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M14 12.75C14.6902 12.7502 15.25 13.3097 15.25 14V19.9717C15.25 20.6619 14.6902 21.2215 14 21.2217C13.3097 21.2216 12.75 20.662 12.75 19.9717V15.2461C12.0855 15.2169 11.5557 14.6717 11.5557 14C11.5557 13.3096 12.1153 12.75 12.8057 12.75H14Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M13.832 7.97949C14.6237 8.04632 15.2498 8.70702 15.25 9.52051C15.25 10.3756 14.5562 11.0692 13.7012 11.0693C12.8462 11.0691 12.1533 10.3755 12.1533 9.52051C12.1523 8.70625 12.7786 8.04689 13.5674 7.97949C13.611 7.97489 13.6554 7.97266 13.7002 7.97266C13.7446 7.97266 13.7888 7.97497 13.832 7.97949ZM13.6035 10.4678L13.7002 10.4727C13.6667 10.4727 13.6334 10.4694 13.6006 10.4668L13.6035 10.4678Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M14 2C20.6274 2.00019 25.9988 7.37257 25.999 14C25.9988 20.6275 20.6275 25.9988 14 25.999C7.37252 25.9989 2.00019 20.6275 2 14C2.00023 7.37256 7.37254 2.00016 14 2ZM14 4.5C8.75325 4.50016 4.50023 8.75327 4.5 14C4.50019 19.2468 8.75323 23.4989 14 23.499C19.2467 23.4988 23.4988 19.2467 23.499 14C23.4988 8.75329 19.2467 4.50019 14 4.5Z"), + ) + }.build() + return _ic_info_28!! + } + +@Composable +@Preview(showBackground = true) +private fun IcInfo28Preview() { + Icon( + imageVector = Icons.ic_info_28, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcMail16.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcMail16.kt new file mode 100644 index 0000000000..93dd181843 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcMail16.kt @@ -0,0 +1,52 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_mail_16: ImageVector? = null + +val Icons.ic_mail_16: ImageVector + get() { + if (_ic_mail_16 != null) return _ic_mail_16!! + _ic_mail_16 = ImageVector.Builder( + name = "ic_mail_16", + defaultWidth = 16.dp, + defaultHeight = 16.dp, + viewportWidth = 16f, + viewportHeight = 16f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M10.9355 5.4375C11.2286 5.25521 11.6135 5.34473 11.7959 5.6377C11.9782 5.9307 11.8886 6.31565 11.5957 6.49805L8.33105 8.5293C8.129 8.6549 7.87295 8.65492 7.6709 8.5293L4.40625 6.49805C4.11345 6.31566 4.02389 5.93067 4.20605 5.6377C4.38838 5.34478 4.77338 5.25535 5.06641 5.4375L8.00098 7.26172L10.9355 5.4375Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M12.5713 2.5C13.6766 2.50014 14.502 3.44503 14.502 4.52148V11.4775C14.5016 12.486 13.7765 13.3795 12.7754 13.4873L12.5713 13.498H3.43066C2.32546 13.498 1.50023 12.5529 1.5 11.4766V4.52148C1.5 3.445 2.32531 2.50009 3.43066 2.5H12.5713ZM3.43066 3.75C3.09322 3.7501 2.75 4.05515 2.75 4.52148V11.4766C2.75022 11.9426 3.09333 12.248 3.43066 12.248H12.5713C12.9087 12.2479 13.2516 11.9425 13.252 11.4775V4.52148C13.252 4.05519 12.9087 3.75015 12.5713 3.75H3.43066Z"), + ) + }.build() + return _ic_mail_16!! + } + +@Composable +@Preview(showBackground = true) +private fun IcMail16Preview() { + Icon( + imageVector = Icons.ic_mail_16, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcMail20.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcMail20.kt new file mode 100644 index 0000000000..ece0daf722 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcMail20.kt @@ -0,0 +1,52 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_mail_20: ImageVector? = null + +val Icons.ic_mail_20: ImageVector + get() { + if (_ic_mail_20 != null) return _ic_mail_20!! + _ic_mail_20 = ImageVector.Builder( + name = "ic_mail_20", + defaultWidth = 20.dp, + defaultHeight = 20.dp, + viewportWidth = 20f, + viewportHeight = 20f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M13.6484 6.95996C14.0043 6.74868 14.464 6.86514 14.6758 7.2207C14.8873 7.57655 14.7707 8.03721 14.415 8.24902L10.3857 10.6455C10.1496 10.7858 9.85527 10.7857 9.61914 10.6455L5.58984 8.24902C5.2341 8.0372 5.11744 7.5766 5.3291 7.2207C5.54094 6.865 6.00154 6.74831 6.35742 6.95996L10.002 9.12695L13.6484 6.95996Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M15.6436 3.5C16.9633 3.50042 18.0049 4.58896 18.0049 5.89746V14.1045C18.0048 15.3306 17.0892 16.3635 15.8877 16.4883L15.6436 16.501H4.3623C3.04231 16.5009 2.00002 15.4122 2 14.1035V5.89746C2.00001 4.58878 3.04231 3.50012 4.3623 3.5H15.6436ZM4.3623 5C3.90175 5.00012 3.50099 5.38584 3.50098 5.89746V14.1035C3.50099 14.6151 3.90175 15.0009 4.3623 15.001H15.6436C16.1041 15.0006 16.5048 14.6148 16.5049 14.1045V5.89746C16.5049 5.38605 16.1039 5.00042 15.6436 5H4.3623Z"), + ) + }.build() + return _ic_mail_20!! + } + +@Composable +@Preview(showBackground = true) +private fun IcMail20Preview() { + Icon( + imageVector = Icons.ic_mail_20, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcMail24.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcMail24.kt new file mode 100644 index 0000000000..9f0fbf048a --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcMail24.kt @@ -0,0 +1,52 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_mail_24: ImageVector? = null + +val Icons.ic_mail_24: ImageVector + get() { + if (_ic_mail_24 != null) return _ic_mail_24!! + _ic_mail_24 = ImageVector.Builder( + name = "ic_mail_24", + defaultWidth = 24.dp, + defaultHeight = 24.dp, + viewportWidth = 24f, + viewportHeight = 24f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M6.14258 8.48535C6.42676 8.01188 7.04112 7.85846 7.51465 8.14258L12 10.833L16.4854 8.14258C16.9589 7.85846 17.5732 8.01188 17.8574 8.48535C18.1415 8.95888 17.9881 9.57324 17.5146 9.85742L12.5146 12.8574C12.198 13.0474 11.802 13.0474 11.4854 12.8574L6.48535 9.85742C6.01188 9.57324 5.85846 8.95888 6.14258 8.48535Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M19 4C20.6598 4 22 5.34813 22 7.00586V16.9951C22 18.6522 20.6595 20 19 20H5C3.34015 20 2 18.6519 2 16.9941V7.00586C2 5.34813 3.34015 4 5 4H19ZM5 6C4.44985 6 4 6.44757 4 7.00586V16.9941C4 17.5524 4.44985 18 5 18H19C19.5505 18 20 17.5521 20 16.9951V7.00586C20 6.44757 19.5502 6 19 6H5Z"), + ) + }.build() + return _ic_mail_24!! + } + +@Composable +@Preview(showBackground = true) +private fun IcMail24Preview() { + Icon( + imageVector = Icons.ic_mail_24, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPercent16.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPercent16.kt new file mode 100644 index 0000000000..33fa8d3ec9 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPercent16.kt @@ -0,0 +1,57 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_percent_16: ImageVector? = null + +val Icons.ic_percent_16: ImageVector + get() { + if (_ic_percent_16 != null) return _ic_percent_16!! + _ic_percent_16 = ImageVector.Builder( + name = "ic_percent_16", + defaultWidth = 16.dp, + defaultHeight = 16.dp, + viewportWidth = 16f, + viewportHeight = 16f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.EvenOdd, + pathData = addPathNodes("M9.87392 9.87313C10.8176 8.92951 12.3472 8.92957 13.2909 9.87313L13.4569 10.0567C14.231 11.0058 14.1756 12.4055 13.2909 13.2901C12.3472 14.2335 10.8176 14.2337 9.87392 13.2901C8.93031 12.3465 8.93038 10.8168 9.87392 9.87313ZM12.3192 10.6768C11.861 10.3029 11.1849 10.3298 10.7577 10.7569C10.3023 11.2124 10.3023 11.9509 10.7577 12.4063C11.2132 12.8617 11.9516 12.8616 12.4071 12.4063C12.8342 11.9793 12.8608 11.3039 12.4872 10.8458L12.4071 10.7569L12.3192 10.6768Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M12.036 3.07723C12.2799 2.83356 12.6757 2.83397 12.9198 3.07723C13.1639 3.32131 13.1639 3.71793 12.9198 3.962L3.96279 12.919C3.7187 13.1631 3.32209 13.1631 3.07802 12.919C2.83453 12.6751 2.83454 12.2792 3.07802 12.0352L12.036 3.07723Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.EvenOdd, + pathData = addPathNodes("M2.70791 2.70712C3.65162 1.76369 5.18124 1.76359 6.1249 2.70712L6.29091 2.89071C7.06491 3.83975 7.00942 5.23944 6.1249 6.12411C5.18119 7.06765 3.6516 7.06768 2.70791 6.12411C1.76422 5.18044 1.76421 3.65078 2.70791 2.70712ZM5.15322 3.51083C4.69509 3.13693 4.0189 3.16394 3.59169 3.59091C3.13617 4.0464 3.1362 4.7848 3.59169 5.24032C4.04723 5.69574 4.78555 5.69571 5.24111 5.24032C5.66794 4.81331 5.69469 4.13783 5.32119 3.67977L5.24111 3.59091L5.15322 3.51083Z"), + ) + }.build() + return _ic_percent_16!! + } + +@Composable +@Preview(showBackground = true) +private fun IcPercent16Preview() { + Icon( + imageVector = Icons.ic_percent_16, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPercent20.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPercent20.kt new file mode 100644 index 0000000000..0343a35a5d --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPercent20.kt @@ -0,0 +1,57 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_percent_20: ImageVector? = null + +val Icons.ic_percent_20: ImageVector + get() { + if (_ic_percent_20 != null) return _ic_percent_20!! + _ic_percent_20 = ImageVector.Builder( + name = "ic_percent_20", + defaultWidth = 20.dp, + defaultHeight = 20.dp, + viewportWidth = 20f, + viewportHeight = 20f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M12.164 12.1622C13.2512 11.0751 14.9998 11.0586 16.1103 12.1075L16.1142 12.1105L16.1708 12.1622L16.3661 12.3771C17.2738 13.49 17.2082 15.1318 16.1708 16.1691C15.0642 17.2753 13.2705 17.2754 12.164 16.1691C11.0577 15.0626 11.0576 13.2687 12.164 12.1622ZM15.0097 13.131C14.4859 12.7039 13.7128 12.7346 13.2245 13.2228C12.704 13.7434 12.7041 14.5878 13.2245 15.1085C13.7453 15.6291 14.5895 15.629 15.1103 15.1085C15.5984 14.6204 15.6291 13.8481 15.2021 13.3243L15.1103 13.2228L15.0097 13.131Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M14.6796 4.25989C14.9725 3.96734 15.4474 3.96712 15.7402 4.25989C16.0328 4.5527 16.0327 5.02758 15.7402 5.32044L5.3222 15.7374C5.02935 16.0303 4.55455 16.0302 4.26166 15.7374C3.96879 15.4445 3.96875 14.9698 4.26166 14.6769L14.6796 4.25989Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M3.83002 3.82825C4.91726 2.74143 6.66596 2.72458 7.7763 3.77356L7.78021 3.77649L7.83685 3.82825L8.03216 4.04309C8.93972 5.15588 8.87397 6.79775 7.83685 7.83509C6.73027 8.94143 4.93656 8.94149 3.83002 7.83509C2.72358 6.72857 2.7235 4.93472 3.83002 3.82825ZM6.67572 4.797C6.15202 4.36988 5.37884 4.40087 4.89056 4.8888C4.36985 5.40947 4.36996 6.2538 4.89056 6.77454C5.41132 7.29516 6.25551 7.29509 6.7763 6.77454C7.26417 6.28641 7.29503 5.51397 6.8681 4.99036L6.7763 4.8888L6.67572 4.797Z"), + ) + }.build() + return _ic_percent_20!! + } + +@Composable +@Preview(showBackground = true) +private fun IcPercent20Preview() { + Icon( + imageVector = Icons.ic_percent_20, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPercent24.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPercent24.kt new file mode 100644 index 0000000000..97de7dfcb8 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPercent24.kt @@ -0,0 +1,57 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_percent_24: ImageVector? = null + +val Icons.ic_percent_24: ImageVector + get() { + if (_ic_percent_24 != null) return _ic_percent_24!! + _ic_percent_24 = ImageVector.Builder( + name = "ic_percent_24", + defaultWidth = 24.dp, + defaultHeight = 24.dp, + viewportWidth = 24f, + viewportHeight = 24f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M15.1704 15.1704C16.7324 13.6084 19.2647 13.6084 20.8267 15.1704L20.9683 15.3188C22.3869 16.8889 22.3398 19.3134 20.8267 20.8266C19.2648 22.3885 16.7324 22.3882 15.1704 20.8266C13.6084 19.2647 13.6085 16.7324 15.1704 15.1704ZM19.2603 16.4467C18.4748 15.8062 17.3165 15.8524 16.5845 16.5844C15.8036 17.3654 15.8036 18.6316 16.5845 19.4126C17.3654 20.193 18.6318 20.1933 19.4126 19.4126C20.1447 18.6804 20.19 17.5212 19.5493 16.7358L19.4126 16.5844L19.2603 16.4467Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M18.7905 3.79245C19.1809 3.40203 19.814 3.40224 20.2046 3.79245C20.5951 4.18297 20.5951 4.81598 20.2046 5.20651L5.20654 20.2046C4.81601 20.5949 4.18295 20.595 3.79248 20.2046C3.40239 19.8141 3.40225 19.1809 3.79248 18.7905L18.7905 3.79245Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M3.17139 3.17135C4.73327 1.60947 7.26565 1.60963 8.82764 3.17135L8.96924 3.31979C10.388 4.88987 10.3408 7.31437 8.82764 8.8276C7.26577 10.3893 4.73333 10.3892 3.17139 8.8276C1.60972 7.26565 1.60964 4.73326 3.17139 3.17135ZM7.26123 4.44772C6.47582 3.80747 5.31743 3.85343 4.58545 4.58542C3.80474 5.36627 3.80483 6.63264 4.58545 7.41354C5.36635 8.19411 6.63275 8.19423 7.41357 7.41354C8.14573 6.68135 8.19107 5.5222 7.55029 4.73678L7.41357 4.58542L7.26123 4.44772Z"), + ) + }.build() + return _ic_percent_24!! + } + +@Composable +@Preview(showBackground = true) +private fun IcPercent24Preview() { + Icon( + imageVector = Icons.ic_percent_24, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPercent28.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPercent28.kt new file mode 100644 index 0000000000..791b59b8c5 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPercent28.kt @@ -0,0 +1,57 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_percent_28: ImageVector? = null + +val Icons.ic_percent_28: ImageVector + get() { + if (_ic_percent_28 != null) return _ic_percent_28!! + _ic_percent_28 = ImageVector.Builder( + name = "ic_percent_28", + defaultWidth = 28.dp, + defaultHeight = 28.dp, + viewportWidth = 28f, + viewportHeight = 28f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M17.3147 17.3155C19.0717 15.5586 21.9209 15.5587 23.678 17.3155C25.4347 19.0726 25.4348 21.9218 23.678 23.6788C21.921 25.4358 19.0718 25.4356 17.3147 23.6788C15.5579 21.9217 15.5577 19.0725 17.3147 17.3155ZM21.7581 18.9464C20.9728 18.3062 19.8151 18.3523 19.0833 19.0841C18.3025 19.8649 18.3025 21.1304 19.0833 21.9112C19.8641 22.6915 21.1298 22.6918 21.9104 21.9112C22.6422 21.1792 22.6875 20.0207 22.0471 19.2354L21.9104 19.0841L21.7581 18.9464Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M21.2366 4.9913C21.7246 4.50323 22.516 4.50343 23.0042 4.9913C23.4923 5.47945 23.4923 6.27072 23.0042 6.75888L6.75806 23.0059C6.26995 23.4938 5.47859 23.4939 4.99048 23.0059C4.50252 22.5178 4.50256 21.7265 4.99048 21.2384L21.2366 4.9913Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M4.31763 4.31747C6.07464 2.56089 8.92395 2.5608 10.6809 4.31747C12.4378 6.07442 12.4375 8.92361 10.6809 10.6808C8.92383 12.4379 6.07471 12.4379 4.31763 10.6808C2.56089 8.92362 2.56067 6.07446 4.31763 4.31747ZM8.76099 5.94833C7.97588 5.30821 6.81808 5.35453 6.08618 6.08603C5.30541 6.86681 5.30543 8.13238 6.08618 8.91317C6.86696 9.69379 8.13262 9.6939 8.91333 8.91317C9.64494 8.18106 9.69063 7.02252 9.05005 6.23739L8.91333 6.08603L8.76099 5.94833Z"), + ) + }.build() + return _ic_percent_28!! + } + +@Composable +@Preview(showBackground = true) +private fun IcPercent28Preview() { + Icon( + imageVector = Icons.ic_percent_28, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPercentBackward20.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPercentBackward20.kt index 968735888a..ec28c7ce8a 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPercentBackward20.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPercentBackward20.kt @@ -46,7 +46,7 @@ val Icons.ic_percent_backward_20: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M8.5 7.62531C8.98325 7.62531 9.375 8.01706 9.375 8.50031C9.3748 8.98274 8.98418 9.37328 8.50195 9.37434L8.5 9.37531C8.26802 9.37544 8.04499 9.28348 7.88086 9.11945C7.71615 8.95474 7.62424 8.73031 7.625 8.49738C7.62658 8.01548 8.01773 7.62531 8.5 7.62531Z"), + pathData = addPathNodes("M8.5 7.62531C8.98325 7.62531 9.375 8.01706 9.375 8.50031C9.3748 8.98274 8.98418 9.37328 8.50195 9.37434L8.5 9.37531C8.26802 9.37543 8.04499 9.28348 7.88086 9.11945C7.71615 8.95474 7.62424 8.73031 7.625 8.49738C7.62658 8.01548 8.01772 7.62531 8.5 7.62531Z"), ) }.build() return _ic_percent_backward_20!! diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPercentBackward24.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPercentBackward24.kt index 2a3039e933..f48fb0b51c 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPercentBackward24.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPercentBackward24.kt @@ -36,7 +36,7 @@ val Icons.ic_percent_backward_24: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M14.126 13.0018C14.3867 13.0017 14.6387 13.091 14.8389 13.2547L14.9219 13.3299L14.9971 13.4129C15.1608 13.6131 15.251 13.865 15.251 14.1258C15.251 14.7471 14.7472 15.2507 14.126 15.2508C13.5047 15.2508 13.001 14.7471 13.001 14.1258C13.0011 13.5059 13.5026 13.0039 14.1221 13.0018H14.126Z"), + pathData = addPathNodes("M14.126 13.0018C14.3867 13.0017 14.6388 13.091 14.8389 13.2547L14.9219 13.3299L14.9971 13.4129C15.1608 13.6131 15.251 13.865 15.251 14.1258C15.251 14.7471 14.7472 15.2507 14.126 15.2508C13.5047 15.2508 13.001 14.7471 13.001 14.1258C13.0011 13.5059 13.5026 13.0039 14.1221 13.0018H14.126Z"), ) addPath( fill = SolidColor(Color.Black), @@ -46,7 +46,7 @@ val Icons.ic_percent_backward_24: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M9.98926 8.75472C10.5565 8.81232 10.9988 9.29151 10.999 9.87386C10.999 10.4943 10.497 10.9964 9.87695 10.9979L9.87793 10.9989L9.875 10.9979L9.87402 10.9989C9.57573 10.9989 9.28912 10.8808 9.07812 10.6698C8.86639 10.4579 8.74791 10.1695 8.74902 9.86995C8.75133 9.25065 9.25419 8.74897 9.87402 8.74886L9.98926 8.75472Z"), + pathData = addPathNodes("M9.98926 8.75472C10.5565 8.81231 10.9988 9.29151 10.999 9.87386C10.999 10.4943 10.497 10.9964 9.87695 10.9979L9.87793 10.9989L9.875 10.9979L9.87402 10.9989C9.57573 10.9989 9.28912 10.8808 9.07812 10.6698C8.86639 10.4579 8.74791 10.1695 8.74902 9.86995C8.75133 9.25065 9.25419 8.74897 9.87402 8.74886L9.98926 8.75472Z"), ) }.build() return _ic_percent_backward_24!! diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPincode20.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPincode20.kt index 21e2906729..224b1a38f9 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPincode20.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPincode20.kt @@ -36,7 +36,7 @@ val Icons.ic_pincode_20: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M5.95898 9.27246C6.34232 8.88986 6.95046 8.87284 7.35547 9.21875L7.36035 9.22168L7.41699 9.27246L7.46777 9.3291C7.47273 9.33522 7.47668 9.34242 7.48145 9.34863C7.72182 9.6405 7.78718 10.0421 7.64062 10.3965C7.48111 10.7819 7.10463 11.034 6.6875 11.0342C6.27036 11.0341 5.89395 10.7819 5.73438 10.3965C5.57495 10.011 5.66379 9.56729 5.95898 9.27246Z"), + pathData = addPathNodes("M5.95898 9.27246C6.34232 8.88986 6.95046 8.87284 7.35547 9.21875L7.36035 9.22168L7.41699 9.27246L7.46777 9.3291C7.47273 9.33522 7.47668 9.34242 7.48145 9.34863C7.72183 9.6405 7.78718 10.0421 7.64062 10.3965C7.48111 10.7819 7.10463 11.034 6.6875 11.0342C6.27036 11.0341 5.89395 10.7819 5.73438 10.3965C5.57495 10.011 5.66379 9.56729 5.95898 9.27246Z"), ) addPath( fill = SolidColor(Color.Black), diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPincode24.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPincode24.kt index 40f4bb2968..51ee030a85 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPincode24.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcPincode24.kt @@ -36,7 +36,7 @@ val Icons.ic_pincode_24: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M6.71484 10.9326C7.25469 10.493 8.05043 10.5248 8.55371 11.0273C8.94733 11.4205 9.06523 12.0123 8.85254 12.5264C8.6397 13.0402 8.13825 13.375 7.58203 13.375C7.02584 13.3749 6.5243 13.0402 6.31152 12.5264C6.09886 12.0124 6.21682 11.4205 6.61035 11.0273L6.71484 10.9326Z"), + pathData = addPathNodes("M6.71484 10.9326C7.25469 10.493 8.05043 10.5248 8.55371 11.0273C8.94733 11.4205 9.06523 12.0123 8.85254 12.5264C8.6397 13.0402 8.13825 13.375 7.58203 13.375C7.02584 13.3749 6.5243 13.0402 6.31152 12.5264C6.09886 12.0124 6.21683 11.4205 6.61035 11.0273L6.71484 10.9326Z"), ) addPath( fill = SolidColor(Color.Black), diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcScanFace20.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcScanFace20.kt new file mode 100644 index 0000000000..00a623083d --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcScanFace20.kt @@ -0,0 +1,82 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_scan_face_20: ImageVector? = null + +val Icons.ic_scan_face_20: ImageVector + get() { + if (_ic_scan_face_20 != null) return _ic_scan_face_20!! + _ic_scan_face_20 = ImageVector.Builder( + name = "ic_scan_face_20", + defaultWidth = 20.dp, + defaultHeight = 20.dp, + viewportWidth = 20f, + viewportHeight = 20f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M2.75 13.2812C3.16403 13.2815 3.5 13.6172 3.5 14.0312V14.8369C3.50011 15.7576 4.24636 16.5046 5.16699 16.5049H5.97363C6.3875 16.5053 6.72363 16.8409 6.72363 17.2549C6.72333 17.6686 6.38731 18.0045 5.97363 18.0049H5.16699C3.41794 18.0046 2.00011 16.586 2 14.8369V14.0312C2 13.617 2.33579 13.2812 2.75 13.2812Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M17.2549 13.2812C17.6689 13.2815 18.0049 13.6172 18.0049 14.0312V14.8369C18.0048 16.5861 16.5861 18.0048 14.8369 18.0049H14.0312C13.6172 18.0049 13.2816 17.6688 13.2812 17.2549C13.2812 16.8407 13.617 16.5049 14.0312 16.5049H14.8369C15.7577 16.5048 16.5048 15.7577 16.5049 14.8369V14.0312C16.5049 13.617 16.8407 13.2812 17.2549 13.2812Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M12.084 12.8213C12.3769 12.5287 12.8527 12.5285 13.1455 12.8213C13.4378 13.114 13.4377 13.589 13.1455 13.8818C11.4102 15.6171 8.59567 15.617 6.86035 13.8818C6.56746 13.5889 6.56746 13.1142 6.86035 12.8213C7.15327 12.5287 7.62811 12.5285 7.9209 12.8213C9.07035 13.9706 10.9345 13.9705 12.084 12.8213Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M10.4053 6.91309C10.8193 6.91332 11.1553 7.24902 11.1553 7.66309V10.4834C11.155 11.342 10.4582 12.0387 9.59961 12.0391H9.19629C8.78223 12.0391 8.44653 11.7031 8.44629 11.2891C8.4464 10.8749 8.78214 10.5391 9.19629 10.5391H9.59961C9.62979 10.5387 9.65503 10.5136 9.65527 10.4834V7.66309C9.65527 7.24887 9.99106 6.91309 10.4053 6.91309Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M6.37598 6.89941C6.79 6.89964 7.12598 7.23534 7.12598 7.64941V8.8584C7.12558 9.27214 6.78976 9.60818 6.37598 9.6084C5.96204 9.60835 5.62637 9.27225 5.62598 8.8584V7.64941C5.62598 7.23523 5.9618 6.89946 6.37598 6.89941Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M13.6279 6.89941C14.042 6.89964 14.3779 7.23534 14.3779 7.64941V8.8584C14.3775 9.27214 14.0417 9.60818 13.6279 9.6084C13.2142 9.60814 12.8783 9.27212 12.8779 8.8584V7.64941C12.8779 7.23536 13.2139 6.89967 13.6279 6.89941Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M5.97363 2C6.3875 2.0004 6.72363 2.33604 6.72363 2.75C6.72342 3.16378 6.38737 3.4996 5.97363 3.5H5.16699C4.24645 3.50025 3.50025 4.24645 3.5 5.16699V5.97363C3.4996 6.38737 3.16378 6.72342 2.75 6.72363C2.33604 6.72363 2.0004 6.3875 2 5.97363V5.16699C2.00025 3.41802 3.41802 2.00025 5.16699 2H5.97363Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M14.8369 2C16.5861 2.00004 18.0046 3.4179 18.0049 5.16699V5.97363C18.0045 6.38736 17.6686 6.72339 17.2549 6.72363C16.8409 6.72363 16.5053 6.3875 16.5049 5.97363V5.16699C16.5046 4.24632 15.7576 3.50004 14.8369 3.5H14.0312C13.6172 3.5 13.2815 3.16403 13.2812 2.75C13.2812 2.33579 13.617 2 14.0312 2H14.8369Z"), + ) + }.build() + return _ic_scan_face_20!! + } + +@Composable +@Preview(showBackground = true) +private fun IcScanFace20Preview() { + Icon( + imageVector = Icons.ic_scan_face_20, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcScanFace24.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcScanFace24.kt new file mode 100644 index 0000000000..72f1fab236 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcScanFace24.kt @@ -0,0 +1,82 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_scan_face_24: ImageVector? = null + +val Icons.ic_scan_face_24: ImageVector + get() { + if (_ic_scan_face_24 != null) return _ic_scan_face_24!! + _ic_scan_face_24 = ImageVector.Builder( + name = "ic_scan_face_24", + defaultWidth = 24.dp, + defaultHeight = 24.dp, + viewportWidth = 24f, + viewportHeight = 24f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M3 16C3.55228 16 4 16.4477 4 17V18C4 19.1046 4.89543 20 6 20H7C7.55228 20 8 20.4477 8 21C8 21.5523 7.55228 22 7 22H6C3.79086 22 2 20.2091 2 18V17C2 16.4477 2.44772 16 3 16Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M21 16C21.5523 16 22 16.4477 22 17V18C22 20.2091 20.2091 22 18 22H17C16.4477 22 16 21.5523 16 21C16 20.4477 16.4477 20 17 20H18C19.1046 20 20 19.1046 20 18V17C20 16.4477 20.4477 16 21 16Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M14.5352 15.4502C14.9257 15.0599 15.5588 15.0597 15.9492 15.4502C16.3395 15.8407 16.3395 16.4738 15.9492 16.8643C13.7687 19.0445 10.2322 19.0447 8.05176 16.8643C7.66131 16.4738 7.66148 15.8407 8.05176 15.4502C8.44228 15.0597 9.0753 15.0597 9.46582 15.4502C10.8652 16.8496 13.1357 16.8494 14.5352 15.4502Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M12.5 8.09668C13.0522 8.09668 13.4998 8.54454 13.5 9.09668V12.5967C13.5 13.701 12.6043 14.5967 11.5 14.5967H11C10.4477 14.5967 10 14.149 10 13.5967C10.0002 13.0445 10.4478 12.5967 11 12.5967H11.5V9.09668C11.5002 8.54454 11.9478 8.09668 12.5 8.09668Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M7.5 8.08008C8.05228 8.08008 8.5 8.52779 8.5 9.08008V10.5801C8.49997 11.1323 8.05226 11.5801 7.5 11.5801C6.94774 11.5801 6.50003 11.1323 6.5 10.5801V9.08008C6.5 8.52779 6.94772 8.08008 7.5 8.08008Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M16.5 8.08008C17.0523 8.08008 17.5 8.52779 17.5 9.08008V10.5801C17.5 11.1323 17.0523 11.5801 16.5 11.5801C15.9477 11.5801 15.5 11.1323 15.5 10.5801V9.08008C15.5 8.52779 15.9477 8.08008 16.5 8.08008Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M7 2C7.55228 2 8 2.44772 8 3C8 3.55228 7.55228 4 7 4H6C4.89543 4 4 4.89543 4 6V7C4 7.55228 3.55228 8 3 8C2.44772 8 2 7.55228 2 7V6C2 3.79086 3.79086 2 6 2H7Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M18 2C20.2091 2 22 3.79086 22 6V7C22 7.55228 21.5523 8 21 8C20.4477 8 20 7.55228 20 7V6C20 4.89543 19.1046 4 18 4H17C16.4477 4 16 3.55228 16 3C16 2.44772 16.4477 2 17 2H18Z"), + ) + }.build() + return _ic_scan_face_24!! + } + +@Composable +@Preview(showBackground = true) +private fun IcScanFace24Preview() { + Icon( + imageVector = Icons.ic_scan_face_24, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcScanFace28.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcScanFace28.kt new file mode 100644 index 0000000000..e2429d8fa5 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcScanFace28.kt @@ -0,0 +1,82 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_scan_face_28: ImageVector? = null + +val Icons.ic_scan_face_28: ImageVector + get() { + if (_ic_scan_face_28 != null) return _ic_scan_face_28!! + _ic_scan_face_28 = ImageVector.Builder( + name = "ic_scan_face_28", + defaultWidth = 28.dp, + defaultHeight = 28.dp, + viewportWidth = 28f, + viewportHeight = 28f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M3.24902 18.7217C3.93928 18.7217 4.49886 19.2815 4.49902 19.9717V21.166C4.49929 22.4541 5.54377 23.4987 6.83203 23.499H8.02637C8.71653 23.499 9.27606 24.0589 9.27637 24.749C9.2761 25.4392 8.71656 25.999 8.02637 25.999H6.83203C4.16315 25.9987 1.99929 23.8349 1.99902 21.166V19.9717C1.99918 19.2816 2.55891 18.7218 3.24902 18.7217Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M24.749 18.7217C25.4393 18.7217 25.9989 19.2815 25.999 19.9717V21.166C25.9988 23.8351 23.8352 25.999 21.166 25.999H19.9717C19.2815 25.999 18.7219 25.4392 18.7217 24.749C18.722 24.0589 19.2815 23.499 19.9717 23.499H21.166C22.4546 23.499 23.4988 22.4543 23.499 21.166V19.9717C23.4992 19.2816 24.059 18.7219 24.749 18.7217Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M16.9873 18.0811C17.4754 17.593 18.2677 17.5932 18.7559 18.0811C19.2434 18.5692 19.2436 19.3606 18.7559 19.8486C16.1297 22.4744 11.8703 22.4744 9.24414 19.8486C8.75638 19.3605 8.75635 18.5691 9.24414 18.0811C9.73219 17.593 10.5235 17.5932 11.0117 18.0811C12.6615 19.7305 15.3374 19.7303 16.9873 18.0811Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M14.5967 9.28223C15.2868 9.2824 15.8465 9.84216 15.8467 10.5322V14.7129C15.8463 16.0621 14.7515 17.157 13.4023 17.1572H12.8047C12.1146 17.1571 11.555 16.5972 11.5547 15.9072C11.5549 15.2171 12.1146 14.6573 12.8047 14.6572H13.3467V10.5322C13.3469 9.84212 13.9065 9.28233 14.5967 9.28223Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M8.62402 9.2627C9.31438 9.2627 9.87402 9.82234 9.87402 10.5127V12.3037C9.87354 12.9937 9.31408 13.5537 8.62402 13.5537C7.93415 13.5535 7.37451 12.9935 7.37402 12.3037V10.5127C7.37402 9.82248 7.93386 9.26292 8.62402 9.2627Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M19.374 9.2627C20.0644 9.2627 20.624 9.82234 20.624 10.5127V12.3037C20.6235 12.9937 20.0641 13.5537 19.374 13.5537C18.6842 13.5534 18.1245 12.9935 18.124 12.3037V10.5127C18.124 9.82254 18.6839 9.26301 19.374 9.2627Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M8.02637 1.99902C8.7166 1.99902 9.27616 2.55982 9.27637 3.25C9.2761 3.94013 8.71656 4.5 8.02637 4.5H6.83203C5.5438 4.50036 4.49934 5.54494 4.49902 6.83301V8.02734C4.49876 8.71747 3.93922 9.27734 3.24902 9.27734C2.55897 9.27718 1.99929 8.71737 1.99902 8.02734V6.83301C1.99934 4.16414 4.16318 1.99938 6.83203 1.99902H8.02637Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M21.166 1.99902C23.8352 1.99903 25.9987 4.16392 25.999 6.83301V8.02734C25.9988 8.71747 25.4392 9.27734 24.749 9.27734C24.059 9.27709 23.4993 8.71732 23.499 8.02734V6.83301C23.4987 5.54473 22.4545 4.5 21.166 4.5H19.9717C19.2815 4.5 18.7219 3.94013 18.7217 3.25C18.7219 2.55982 19.2814 1.99902 19.9717 1.99902H21.166Z"), + ) + }.build() + return _ic_scan_face_28!! + } + +@Composable +@Preview(showBackground = true) +private fun IcScanFace28Preview() { + Icon( + imageVector = Icons.ic_scan_face_28, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcScanFinger20.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcScanFinger20.kt new file mode 100644 index 0000000000..2baee88672 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcScanFinger20.kt @@ -0,0 +1,67 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_scan_finger_20: ImageVector? = null + +val Icons.ic_scan_finger_20: ImageVector + get() { + if (_ic_scan_finger_20 != null) return _ic_scan_finger_20!! + _ic_scan_finger_20 = ImageVector.Builder( + name = "ic_scan_finger_20", + defaultWidth = 20.dp, + defaultHeight = 20.dp, + viewportWidth = 20f, + viewportHeight = 20f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M12.0124 14.8955C12.1618 14.5097 12.5961 14.318 12.9821 14.4668C13.3681 14.6161 13.5598 15.0503 13.4108 15.4365C13.1205 16.1883 12.7739 16.9187 12.3747 17.6201C12.1697 17.9796 11.712 18.1051 11.3523 17.9004C10.9927 17.6953 10.8672 17.2377 11.072 16.8779C11.4345 16.241 11.7489 15.5779 12.0124 14.8955Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M10.2644 8.88865C10.6784 8.88868 11.0142 9.22459 11.0144 9.63865C11.015 12.4596 10.0677 15.2001 8.32198 17.4306C8.06683 17.7565 7.59537 17.8142 7.26924 17.5596C6.94342 17.3042 6.88526 16.8319 7.14034 16.5058C8.68058 14.5378 9.51494 12.1225 9.51436 9.63865C9.51444 9.22477 9.85051 8.88904 10.2644 8.88865Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M10.2653 5.44432C12.5975 5.44453 14.5055 7.31162 14.5065 9.6367V9.63865C14.5063 10.3695 14.4562 11.1001 14.3562 11.8242C14.2993 12.2343 13.9206 12.5204 13.5105 12.4638C13.1007 12.4069 12.8135 12.029 12.8698 11.6191C12.9605 10.963 13.0063 10.3009 13.0065 9.63865V9.6367C13.0055 8.15931 11.7885 6.94453 10.2653 6.94432C8.74176 6.94469 7.52324 8.16057 7.52315 9.63865C7.52315 9.64975 7.52169 9.66087 7.5212 9.67185C7.5158 11.8542 6.73697 13.965 5.31905 15.6367C5.05109 15.9523 4.57722 15.9914 4.26143 15.7236C3.94624 15.4558 3.9073 14.9827 4.17452 14.667C5.37107 13.2564 6.02442 11.476 6.02217 9.63963C6.02217 9.62597 6.02342 9.61209 6.02413 9.59861C6.04586 7.29137 7.94609 5.44469 10.2653 5.44432Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M6.01339 3.26072C8.3863 1.71559 11.4267 1.58123 13.9294 2.91014C16.4329 4.23982 17.9996 6.82266 17.9987 9.63768C17.998 11.1835 17.8129 12.7254 17.448 14.2285C17.3502 14.6307 16.945 14.8777 16.5427 14.7803C16.1406 14.6824 15.8935 14.2772 15.9909 13.875C16.3278 12.4875 16.498 11.0652 16.4987 9.63865C16.4995 7.38607 15.2453 5.30815 13.2253 4.23533C11.2039 3.16206 8.74676 3.27059 6.83174 4.51756C6.48474 4.7431 6.0196 4.64562 5.79366 4.29881C5.56802 3.9519 5.6668 3.4868 6.01339 3.26072Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M3.30831 6.31541C3.49148 5.94415 3.94185 5.79178 4.31319 5.97459C4.68465 6.15786 4.83728 6.60801 4.65401 6.97947C4.24545 7.8077 4.03204 8.71657 4.03096 9.6367V9.63963C4.03015 10.5378 3.82117 11.4239 3.42061 12.2295C3.23614 12.5999 2.78639 12.7513 2.41573 12.5674C2.04534 12.3828 1.89373 11.9322 2.07784 11.5615C2.37574 10.9623 2.53042 10.3031 2.53096 9.6367C2.53201 8.48565 2.79812 7.34958 3.30831 6.31541Z"), + ) + }.build() + return _ic_scan_finger_20!! + } + +@Composable +@Preview(showBackground = true) +private fun IcScanFinger20Preview() { + Icon( + imageVector = Icons.ic_scan_finger_20, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcScanFinger24.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcScanFinger24.kt new file mode 100644 index 0000000000..256de02305 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcScanFinger24.kt @@ -0,0 +1,67 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_scan_finger_24: ImageVector? = null + +val Icons.ic_scan_finger_24: ImageVector + get() { + if (_ic_scan_finger_24 != null) return _ic_scan_finger_24!! + _ic_scan_finger_24 = ImageVector.Builder( + name = "ic_scan_finger_24", + defaultWidth = 24.dp, + defaultHeight = 24.dp, + viewportWidth = 24f, + viewportHeight = 24f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M14.248 17.6974C14.447 17.1823 15.0259 16.9263 15.541 17.1251C16.056 17.3242 16.3131 17.9031 16.1143 18.4181C15.7714 19.3057 15.3621 20.1673 14.8906 20.9953C14.6173 21.475 14.0062 21.6423 13.5264 21.3693C13.0468 21.096 12.8796 20.4858 13.1523 20.006C13.5747 19.2642 13.941 18.4922 14.248 17.6974Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M12.3125 10.5773C12.8648 10.5772 13.3133 11.025 13.3135 11.5773C13.3141 14.9117 12.1924 18.1511 10.1279 20.7873C9.78744 21.2215 9.15925 21.2982 8.72461 20.9582C8.28999 20.6178 8.21372 19.9896 8.55371 19.5548C10.3441 17.2686 11.314 14.4621 11.3135 11.5773C11.3135 11.0252 11.7605 10.5776 12.3125 10.5773Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M12.3125 6.53823C15.1124 6.53844 17.406 8.78132 17.4062 11.5763C17.4062 11.584 17.4045 11.5921 17.4043 11.5998C17.4029 12.4548 17.3446 13.3102 17.2275 14.1574C17.1513 14.7037 16.6471 15.0862 16.1006 15.0109C15.5539 14.9351 15.1719 14.4296 15.2471 13.883C15.3527 13.119 15.4049 12.3482 15.4053 11.5773C15.4052 9.91234 14.0338 8.53844 12.3125 8.53823C10.5915 8.53829 9.21956 9.9109 9.21875 11.5753C9.22189 14.1772 8.29513 16.6958 6.60449 18.6876C6.24706 19.1084 5.6153 19.1602 5.19433 18.8029C4.77367 18.4455 4.72197 17.8137 5.0791 17.3927C6.46441 15.7606 7.22136 13.7013 7.21875 11.5773V11.5753C7.21956 8.78071 9.51277 6.53829 12.3125 6.53823Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M7.26171 3.99721C10.0807 2.16169 13.6922 2.00324 16.665 3.58218C19.6387 5.16176 21.5008 8.23004 21.5 11.5753V11.5773C21.4991 13.3991 21.2809 15.2159 20.8506 16.9874C20.7198 17.5233 20.1797 17.8528 19.6436 17.7228C19.1071 17.5925 18.7773 17.0512 18.9072 16.5148C19.3001 14.8976 19.4991 13.24 19.5 11.5773V11.5753C19.5008 8.97961 18.0558 6.58493 15.7266 5.3478C13.3954 4.10975 10.562 4.236 8.35351 5.67397C7.89075 5.97518 7.27108 5.84368 6.96972 5.381C6.66861 4.91828 6.79913 4.29857 7.26171 3.99721Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M4.04785 7.6271C4.29225 7.13212 4.89258 6.92896 5.38769 7.173C5.88258 7.41745 6.08586 8.01679 5.84179 8.51186C5.37056 9.46676 5.12528 10.5147 5.12402 11.5753V11.5783C5.12301 12.6501 4.8735 13.7079 4.3955 14.6691C4.14934 15.163 3.5489 15.365 3.05468 15.1193C2.56055 14.8734 2.35915 14.2728 2.60449 13.7785C2.94563 13.0925 3.12336 12.3381 3.12402 11.5753C3.12528 10.2069 3.44122 8.85644 4.04785 7.6271Z"), + ) + }.build() + return _ic_scan_finger_24!! + } + +@Composable +@Preview(showBackground = true) +private fun IcScanFinger24Preview() { + Icon( + imageVector = Icons.ic_scan_finger_24, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcScanFinger28.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcScanFinger28.kt new file mode 100644 index 0000000000..f424ebc5ae --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcScanFinger28.kt @@ -0,0 +1,67 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_scan_finger_28: ImageVector? = null + +val Icons.ic_scan_finger_28: ImageVector + get() { + if (_ic_scan_finger_28 != null) return _ic_scan_finger_28!! + _ic_scan_finger_28 = ImageVector.Builder( + name = "ic_scan_finger_28", + defaultWidth = 28.dp, + defaultHeight = 28.dp, + viewportWidth = 28f, + viewportHeight = 28f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M16.4788 20.4991C16.7273 19.8554 17.4512 19.5353 18.095 19.7833C18.739 20.0318 19.0602 20.7555 18.8118 21.3995C18.4171 22.4222 17.9462 23.4151 17.4036 24.3692C17.0622 24.969 16.2985 25.1792 15.6985 24.838C15.0992 24.4967 14.8893 23.7336 15.2298 23.1339C15.7112 22.2874 16.1288 21.406 16.4788 20.4991Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M14.3557 12.2647C15.0458 12.2647 15.6064 12.8246 15.6067 13.5147C15.6075 17.3629 14.3141 21.1014 11.9329 24.1436C11.5073 24.6868 10.7215 24.7828 10.178 24.3575C9.63466 23.9321 9.53905 23.1462 9.96413 22.6026C12.0029 19.9979 13.1075 16.8011 13.1067 13.5147C13.1069 12.8249 13.666 12.2653 14.3557 12.2647Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M14.3557 7.63288C17.6231 7.63288 20.3017 10.2504 20.302 13.5147C20.3016 14.5087 20.2329 15.5026 20.0969 16.4874C20.0024 17.1709 19.3713 17.6489 18.6878 17.5548C18.0042 17.4602 17.5262 16.8292 17.6204 16.1456C17.7401 15.2782 17.8001 14.4037 17.801 13.5284C17.801 13.5242 17.801 13.5198 17.801 13.5157C17.801 11.6635 16.2746 10.1329 14.3557 10.1329C12.4381 10.1333 10.9119 11.662 10.9104 13.5128L10.8987 14.0762C10.7769 16.8841 9.72096 19.5788 7.88893 21.7383C7.44228 22.2644 6.6535 22.3293 6.12721 21.8829C5.6011 21.4364 5.53654 20.6475 5.98268 20.1212C7.55523 18.2675 8.41329 15.9286 8.41042 13.5167V13.5128C8.41185 10.2496 11.0893 7.63327 14.3557 7.63288Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M8.5071 4.73444C11.7718 2.60837 15.9538 2.42444 19.3967 4.253C22.8417 6.08298 24.9992 9.63856 24.9973 13.5157C24.9963 15.6135 24.7443 17.7043 24.2493 19.7442C24.0864 20.4148 23.4111 20.8267 22.7405 20.6641C22.0703 20.5011 21.6574 19.8257 21.8196 19.1553C22.2679 17.3077 22.4955 15.4134 22.4964 13.5137C22.4964 13.5093 22.4963 13.5045 22.4964 13.5001C22.4923 10.5662 20.859 7.86048 18.2249 6.46101C15.5843 5.05847 12.3739 5.20038 9.87233 6.82917C9.2939 7.20555 8.51853 7.04224 8.14186 6.46394C7.76562 5.8857 7.92927 5.11125 8.5071 4.73444Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M4.78444 8.93952C5.08961 8.3205 5.83917 8.06632 6.45827 8.37116C7.07747 8.67642 7.33188 9.42579 7.02663 10.045C6.49388 11.1259 6.21669 12.3121 6.2151 13.5128V13.5157C6.21404 14.7613 5.92428 15.9905 5.3694 17.1075C5.06208 17.7253 4.31165 17.9769 3.69362 17.67C3.07597 17.3628 2.82364 16.6131 3.13014 15.9952C3.51404 15.2223 3.71435 14.373 3.7151 13.5137C3.71664 11.9286 4.08254 10.3636 4.78444 8.93952Z"), + ) + }.build() + return _ic_scan_finger_28!! + } + +@Composable +@Preview(showBackground = true) +private fun IcScanFinger28Preview() { + Icon( + imageVector = Icons.ic_scan_finger_28, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcScanQr20.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcScanQr20.kt new file mode 100644 index 0000000000..bf2e9eeb29 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcScanQr20.kt @@ -0,0 +1,102 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_scan_qr_20: ImageVector? = null + +val Icons.ic_scan_qr_20: ImageVector + get() { + if (_ic_scan_qr_20 != null) return _ic_scan_qr_20!! + _ic_scan_qr_20 = ImageVector.Builder( + name = "ic_scan_qr_20", + defaultWidth = 20.dp, + defaultHeight = 20.dp, + viewportWidth = 20f, + viewportHeight = 20f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M2.75 13.2812C3.16403 13.2815 3.5 13.6172 3.5 14.0312V14.8369C3.50011 15.7576 4.24636 16.5046 5.16699 16.5049H5.97363C6.3875 16.5053 6.72363 16.8409 6.72363 17.2549C6.72333 17.6686 6.38731 18.0045 5.97363 18.0049H5.16699C3.41794 18.0046 2.00011 16.586 2 14.8369V14.0312C2 13.617 2.33579 13.2812 2.75 13.2812Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M17.2549 13.2812C17.6689 13.2815 18.0049 13.6172 18.0049 14.0312V14.8369C18.0048 16.5861 16.5861 18.0048 14.8369 18.0049H14.0312C13.6172 18.0049 13.2816 17.6688 13.2812 17.2549C13.2812 16.8407 13.617 16.5049 14.0312 16.5049H14.8369C15.7577 16.5048 16.5048 15.7577 16.5049 14.8369V14.0312C16.5049 13.617 16.8407 13.2812 17.2549 13.2812Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M10.7773 13.4453C11.0718 13.2051 11.5066 13.2217 11.7812 13.4961L11.7852 13.501C12.0777 13.7939 12.0779 14.2687 11.7852 14.5615L11.7812 14.5654C11.4885 14.8581 11.0136 14.858 10.7207 14.5654L10.7158 14.5615C10.4234 14.2688 10.4235 13.7938 10.7158 13.501L10.7207 13.4961L10.7773 13.4453Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M13.5176 13.4453C13.8121 13.2051 14.2469 13.2216 14.5215 13.4961L14.5254 13.501C14.8179 13.7939 14.818 14.2687 14.5254 14.5615L14.5215 14.5654C14.2287 14.8582 13.7539 14.858 13.4609 14.5654L13.4561 14.5615C13.1634 14.2688 13.1636 13.7939 13.4561 13.501L13.4609 13.4961L13.5176 13.4453Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M8.29297 10.4609C8.98333 10.4609 9.54297 11.0206 9.54297 11.7109V14.0312C9.54282 14.4453 9.20709 14.7812 8.79297 14.7812H6.47266C5.78243 14.7812 5.22281 14.2214 5.22266 13.5312V11.7109C5.22266 11.0206 5.78234 10.461 6.47266 10.4609H8.29297ZM6.72266 13.2812H8.04297V11.9609H6.72266V13.2812Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M12.1475 12.0352C12.4419 11.7949 12.8767 11.8116 13.1514 12.0859L13.1553 12.0908C13.4478 12.3837 13.448 12.8586 13.1553 13.1514L13.1514 13.1553C12.8586 13.448 12.3837 13.4478 12.0908 13.1553L12.0859 13.1514C11.7935 12.8586 11.7937 12.3837 12.0859 12.0908L12.0908 12.0859L12.1475 12.0352Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M10.7773 10.625C11.0718 10.3847 11.5066 10.4014 11.7812 10.6758L11.7852 10.6807C12.0777 10.9736 12.0779 11.4484 11.7852 11.7412L11.7812 11.7451C11.4885 12.0378 11.0136 12.0376 10.7207 11.7451L10.7158 11.7412C10.4233 11.4485 10.4235 10.9735 10.7158 10.6807L10.7207 10.6758L10.7773 10.625Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M13.5176 10.625C13.8121 10.3848 14.2469 10.4012 14.5215 10.6758L14.5254 10.6807C14.8179 10.9736 14.8181 11.4484 14.5254 11.7412L14.5215 11.7451C14.2287 12.0379 13.7539 12.0377 13.4609 11.7451L13.4561 11.7412C13.1633 11.4485 13.1636 10.9736 13.4561 10.6807L13.4609 10.6758L13.5176 10.625Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M8.29297 5.22266C8.98326 5.22266 9.54286 5.78239 9.54297 6.47266V8.79297C9.54297 9.20718 9.20718 9.54297 8.79297 9.54297H6.47266C5.78234 9.54292 5.22266 8.9833 5.22266 8.29297V6.47266C5.22277 5.78242 5.78241 5.2227 6.47266 5.22266H8.29297ZM6.72266 8.04297H8.04297V6.72266H6.72266V8.04297Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M13.5312 5.22266C14.2214 5.22278 14.7811 5.78247 14.7812 6.47266V8.79297C14.7812 9.20711 14.4454 9.54285 14.0312 9.54297H11.7109C11.0206 9.54297 10.4609 8.98332 10.4609 8.29297V6.47266C10.461 5.78239 11.0206 5.22266 11.7109 5.22266H13.5312ZM11.9609 8.04297H13.2812V6.72266H11.9609V8.04297Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M5.97363 2C6.3875 2.0004 6.72363 2.33604 6.72363 2.75C6.72342 3.16378 6.38737 3.4996 5.97363 3.5H5.16699C4.24645 3.50025 3.50025 4.24645 3.5 5.16699V5.97363C3.4996 6.38737 3.16378 6.72342 2.75 6.72363C2.33604 6.72363 2.0004 6.3875 2 5.97363V5.16699C2.00025 3.41802 3.41802 2.00025 5.16699 2H5.97363Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M14.8369 2C16.5861 2.00004 18.0046 3.4179 18.0049 5.16699V5.97363C18.0045 6.38736 17.6686 6.72339 17.2549 6.72363C16.8409 6.72363 16.5053 6.3875 16.5049 5.97363V5.16699C16.5046 4.24632 15.7576 3.50004 14.8369 3.5H14.0312C13.6172 3.5 13.2815 3.16403 13.2812 2.75C13.2812 2.33579 13.617 2 14.0312 2H14.8369Z"), + ) + }.build() + return _ic_scan_qr_20!! + } + +@Composable +@Preview(showBackground = true) +private fun IcScanQr20Preview() { + Icon( + imageVector = Icons.ic_scan_qr_20, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcScanQr24.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcScanQr24.kt new file mode 100644 index 0000000000..e26040cbb6 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcScanQr24.kt @@ -0,0 +1,102 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_scan_qr_24: ImageVector? = null + +val Icons.ic_scan_qr_24: ImageVector + get() { + if (_ic_scan_qr_24 != null) return _ic_scan_qr_24!! + _ic_scan_qr_24 = ImageVector.Builder( + name = "ic_scan_qr_24", + defaultWidth = 24.dp, + defaultHeight = 24.dp, + viewportWidth = 24f, + viewportHeight = 24f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M3 16C3.55228 16 4 16.4477 4 17V18C4 19.1046 4.89543 20 6 20H7C7.55228 20 8 20.4477 8 21C8 21.5523 7.55228 22 7 22H6C3.79086 22 2 20.2091 2 18V17C2 16.4477 2.44772 16 3 16Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M21 16C21.5523 16 22 16.4477 22 17V18C22 20.2091 20.2091 22 18 22H17C16.4477 22 16 21.5523 16 21C16 20.4477 16.4477 20 17 20H18C19.1046 20 20 19.1046 20 18V17C20 16.4477 20.4477 16 21 16Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M12.8428 16.2881C13.2333 15.8976 13.8663 15.8977 14.2568 16.2881L14.2617 16.293C14.6522 16.6835 14.6522 17.3165 14.2617 17.707L14.2568 17.7119C13.8663 18.1023 13.2333 18.1024 12.8428 17.7119L12.8379 17.707C12.4475 17.3165 12.4475 16.6835 12.8379 16.293L12.8428 16.2881Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M16.2432 16.2881C16.6337 15.8977 17.2667 15.8976 17.6572 16.2881L17.6621 16.293C18.0525 16.6835 18.0525 17.3165 17.6621 17.707L17.6572 17.7119C17.2667 18.1024 16.6337 18.1023 16.2432 17.7119L16.2383 17.707C15.8478 17.3165 15.8478 16.6835 16.2383 16.293L16.2432 16.2881Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M10 12.5C10.8284 12.5 11.5 13.1716 11.5 14V17C11.5 17.5523 11.0523 18 10.5 18H7.5C6.67157 18 6 17.3284 6 16.5V14C6 13.1716 6.67157 12.5 7.5 12.5H10ZM8 16H9.5V14.5H8V16Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M14.543 14.5381C14.9335 14.1476 15.5665 14.1476 15.957 14.5381L15.9619 14.543C16.3524 14.9335 16.3524 15.5665 15.9619 15.957L15.957 15.9619C15.5665 16.3524 14.9335 16.3524 14.543 15.9619L14.5381 15.957C14.1476 15.5665 14.1476 14.9335 14.5381 14.543L14.543 14.5381Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M12.8428 12.7881C13.2333 12.3976 13.8663 12.3977 14.2568 12.7881L14.2617 12.793C14.6522 13.1835 14.6522 13.8165 14.2617 14.207L14.2568 14.2119C13.8663 14.6023 13.2333 14.6024 12.8428 14.2119L12.8379 14.207C12.4475 13.8165 12.4475 13.1835 12.8379 12.793L12.8428 12.7881Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M16.2432 12.7881C16.6337 12.3977 17.2667 12.3976 17.6572 12.7881L17.6621 12.793C18.0525 13.1835 18.0525 13.8165 17.6621 14.207L17.6572 14.2119C17.2667 14.6024 16.6337 14.6023 16.2432 14.2119L16.2383 14.207C15.8478 13.8165 15.8478 13.1835 16.2383 12.793L16.2432 12.7881Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M10 6C10.8284 6 11.5 6.67157 11.5 7.5V10.5C11.5 11.0523 11.0523 11.5 10.5 11.5H7.5C6.67157 11.5 6 10.8284 6 10V7.5C6 6.67157 6.67157 6 7.5 6H10ZM8 9.5H9.5V8H8V9.5Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M16.5 6C17.3284 6 18 6.67157 18 7.5V10.5C18 11.0523 17.5523 11.5 17 11.5H14C13.1716 11.5 12.5 10.8284 12.5 10V7.5C12.5 6.67157 13.1716 6 14 6H16.5ZM14.5 9.5H16V8H14.5V9.5Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M7 2C7.55228 2 8 2.44772 8 3C8 3.55228 7.55228 4 7 4H6C4.89543 4 4 4.89543 4 6V7C4 7.55228 3.55228 8 3 8C2.44772 8 2 7.55228 2 7V6C2 3.79086 3.79086 2 6 2H7Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M18 2C20.2091 2 22 3.79086 22 6V7C22 7.55228 21.5523 8 21 8C20.4477 8 20 7.55228 20 7V6C20 4.89543 19.1046 4 18 4H17C16.4477 4 16 3.55228 16 3C16 2.44772 16.4477 2 17 2H18Z"), + ) + }.build() + return _ic_scan_qr_24!! + } + +@Composable +@Preview(showBackground = true) +private fun IcScanQr24Preview() { + Icon( + imageVector = Icons.ic_scan_qr_24, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcShareAndroid20.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcShareAndroid20.kt index 4d55d4e24b..d396ef491d 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcShareAndroid20.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcShareAndroid20.kt @@ -31,7 +31,7 @@ val Icons.ic_share_android_20: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M12.3772 3.37816C13.5488 2.20706 15.4479 2.20684 16.6194 3.37816L16.7258 3.48949C17.7901 4.667 17.7541 6.48523 16.6194 7.62035C15.4478 8.79166 13.5487 8.79182 12.3772 7.62035C12.3273 7.57044 12.2803 7.51849 12.2346 7.46605L8.42995 9.3684C8.51871 9.78341 8.52065 10.2131 8.4319 10.6282L12.2346 12.5295C12.28 12.4774 12.3276 12.4258 12.3772 12.3762C13.5487 11.2052 15.4479 11.2051 16.6194 12.3762L16.7258 12.4875C17.7901 13.665 17.7541 15.4833 16.6194 16.6184C15.4478 17.7899 13.5488 17.7899 12.3772 16.6184C11.6315 15.8725 11.3629 14.8323 11.5667 13.8723L7.75709 11.968C7.71291 12.0185 7.66947 12.0712 7.62135 12.1194C6.44983 13.2909 4.55077 13.2907 3.37916 12.1194C2.20761 10.9478 2.20758 9.04876 3.37916 7.87719C4.5508 6.70628 6.44997 6.70588 7.62135 7.87719L7.7278 7.98851C7.73882 8.00071 7.74826 8.01427 7.75905 8.0266L11.5667 6.12328C11.3633 5.16358 11.6318 4.1237 12.3772 3.37816ZM15.4456 13.3332C14.8565 12.853 13.9869 12.8881 13.4378 13.4368C13.3456 13.5289 13.2685 13.6312 13.2053 13.7385C13.1944 13.7708 13.1829 13.8039 13.1673 13.8352C13.1508 13.8681 13.1301 13.8986 13.1096 13.928C12.8874 14.4705 12.9973 15.1172 13.4378 15.5578C14.0235 16.1436 14.973 16.1436 15.5589 15.5578C16.1075 15.0088 16.1424 14.14 15.6624 13.551L15.5589 13.4368L15.4456 13.3332ZM6.44752 8.83422C5.85857 8.35384 4.98896 8.38916 4.43971 8.93773C3.85392 9.52352 3.85394 10.473 4.43971 11.0588C5.02553 11.6444 5.97507 11.6445 6.56081 11.0588C6.65438 10.9651 6.73153 10.8605 6.79518 10.7512C6.80525 10.7231 6.81762 10.6946 6.83131 10.6672C6.8454 10.6391 6.8612 10.6117 6.87819 10.5862C7.03699 10.2133 7.03917 9.78966 6.88209 9.41625C6.86365 9.38907 6.84643 9.36048 6.83131 9.33031C6.81696 9.30158 6.80458 9.27196 6.7942 9.24242C6.75582 9.1768 6.71353 9.11238 6.66432 9.05199L6.56081 8.93773L6.44752 8.83422ZM15.4456 4.33519C14.8565 3.85483 13.987 3.88996 13.4378 4.43871C12.9973 4.87938 12.8883 5.52603 13.1106 6.06859C13.1311 6.09809 13.1507 6.12926 13.1673 6.16234C13.1825 6.19282 13.1936 6.22472 13.2044 6.25609C13.2678 6.36431 13.3449 6.46696 13.4378 6.5598C14.0235 7.14549 14.973 7.14532 15.5589 6.5598C16.1075 6.01072 16.1424 5.14197 15.6624 4.55297L15.5589 4.43871L15.4456 4.33519Z"), + pathData = addPathNodes("M12.3772 3.37816C13.5488 2.20706 15.4479 2.20684 16.6194 3.37816L16.7258 3.48949C17.7901 4.667 17.7541 6.48523 16.6194 7.62035C15.4478 8.79166 13.5487 8.79182 12.3772 7.62035C12.3273 7.57044 12.2803 7.5185 12.2346 7.46605L8.42995 9.3684C8.51871 9.78341 8.52065 10.2131 8.4319 10.6282L12.2346 12.5295C12.28 12.4774 12.3276 12.4258 12.3772 12.3762C13.5487 11.2052 15.4479 11.2051 16.6194 12.3762L16.7258 12.4875C17.7901 13.665 17.7541 15.4833 16.6194 16.6184C15.4478 17.7899 13.5488 17.7899 12.3772 16.6184C11.6315 15.8725 11.3629 14.8323 11.5667 13.8723L7.75709 11.968C7.71291 12.0185 7.66948 12.0712 7.62135 12.1194C6.44983 13.2909 4.55078 13.2907 3.37916 12.1194C2.20761 10.9478 2.20758 9.04876 3.37916 7.87719C4.5508 6.70628 6.44997 6.70588 7.62135 7.87719L7.7278 7.98851C7.73882 8.00071 7.74826 8.01427 7.75905 8.0266L11.5667 6.12328C11.3633 5.16358 11.6318 4.1237 12.3772 3.37816ZM15.4456 13.3332C14.8565 12.853 13.9869 12.8881 13.4378 13.4368C13.3456 13.5289 13.2685 13.6312 13.2053 13.7385C13.1944 13.7708 13.1829 13.8039 13.1673 13.8352C13.1508 13.8681 13.1301 13.8986 13.1096 13.928C12.8874 14.4705 12.9973 15.1172 13.4378 15.5578C14.0235 16.1436 14.973 16.1436 15.5589 15.5578C16.1075 15.0088 16.1424 14.14 15.6624 13.551L15.5589 13.4368L15.4456 13.3332ZM6.44752 8.83422C5.85857 8.35384 4.98896 8.38916 4.43971 8.93773C3.85392 9.52352 3.85394 10.473 4.43971 11.0588C5.02553 11.6444 5.97507 11.6445 6.56081 11.0588C6.65438 10.9651 6.73153 10.8605 6.79518 10.7512C6.80525 10.7231 6.81762 10.6946 6.83131 10.6672C6.8454 10.6391 6.8612 10.6117 6.87819 10.5862C7.03699 10.2133 7.03917 9.78966 6.88209 9.41625C6.86365 9.38907 6.84643 9.36048 6.83131 9.33031C6.81696 9.30158 6.80458 9.27196 6.7942 9.24242C6.75582 9.1768 6.71353 9.11238 6.66432 9.05199L6.56081 8.93773L6.44752 8.83422ZM15.4456 4.33519C14.8565 3.85483 13.987 3.88996 13.4378 4.43871C12.9973 4.87938 12.8883 5.52603 13.1106 6.06859C13.1311 6.09809 13.1507 6.12926 13.1673 6.16234C13.1825 6.19282 13.1936 6.22472 13.2044 6.25609C13.2678 6.36431 13.3449 6.46696 13.4378 6.5598C14.0235 7.14549 14.973 7.14532 15.5589 6.5598C16.1075 6.01072 16.1424 5.14197 15.6624 4.55297L15.5589 4.43871L15.4456 4.33519Z"), ) }.build() return _ic_share_android_20!! diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcShieldCheckmark24.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcShieldCheckmark24.kt index 64a7e6da71..375d16095c 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcShieldCheckmark24.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcShieldCheckmark24.kt @@ -31,7 +31,7 @@ val Icons.ic_shield_checkmark_24: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M14.2705 9.317C14.6482 8.91414 15.2807 8.89353 15.6836 9.2711C16.0862 9.6488 16.107 10.2813 15.7295 10.6842L11.9795 14.6842C11.7905 14.8857 11.5263 15.0006 11.25 15.0006C10.9737 15.0006 10.7095 14.8857 10.5205 14.6842L8.27051 12.2848C7.89285 11.8819 7.91371 11.2485 8.31641 10.8707C8.71932 10.4933 9.35187 10.5139 9.72949 10.9166L11.25 12.5387L14.2705 9.317Z"), + pathData = addPathNodes("M14.2705 9.317C14.6482 8.91414 15.2807 8.89353 15.6836 9.2711C16.0862 9.64881 16.107 10.2813 15.7295 10.6842L11.9795 14.6842C11.7905 14.8857 11.5263 15.0006 11.25 15.0006C10.9737 15.0006 10.7095 14.8857 10.5205 14.6842L8.27051 12.2848C7.89285 11.8819 7.91371 11.2485 8.31641 10.8707C8.71932 10.4933 9.35187 10.5139 9.72949 10.9166L11.25 12.5387L14.2705 9.317Z"), ) addPath( fill = SolidColor(Color.Black), diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcSnowflake12.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcSnowflake12.kt new file mode 100644 index 0000000000..e7f979d6da --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcSnowflake12.kt @@ -0,0 +1,47 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_snowflake_12: ImageVector? = null + +val Icons.ic_snowflake_12: ImageVector + get() { + if (_ic_snowflake_12 != null) return _ic_snowflake_12!! + _ic_snowflake_12 = ImageVector.Builder( + name = "ic_snowflake_12", + defaultWidth = 12.dp, + defaultHeight = 12.dp, + viewportWidth = 12f, + viewportHeight = 12f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M5.99906 1C6.27506 1.00001 6.49884 1.22406 6.49906 1.5V2.08887L6.73051 1.85742C6.92576 1.66235 7.24232 1.66227 7.43754 1.85742C7.6325 2.05264 7.63257 2.36925 7.43754 2.56445L6.49906 3.50293V5.13379L7.91215 4.31738L8.2559 3.03711C8.32749 2.77082 8.60177 2.61155 8.86821 2.68262C9.13442 2.75409 9.29343 3.0286 9.2227 3.29492L9.13774 3.61035L9.74906 3.25781C9.9882 3.11974 10.2946 3.2013 10.4327 3.44043C10.5703 3.67948 10.488 3.98506 10.2491 4.12305L9.63676 4.47559L9.95219 4.56055C10.2186 4.63207 10.3768 4.90637 10.3057 5.17285C10.2341 5.4392 9.95988 5.59754 9.6934 5.52637L8.41215 5.18262L6.99809 5.99902L8.41117 6.81445L9.6934 6.47168C9.95995 6.40059 10.2343 6.55966 10.3057 6.82617C10.3769 7.09266 10.2185 7.36687 9.95219 7.43848L9.63676 7.52246L10.2491 7.87598C10.4879 8.01413 10.5706 8.32055 10.4327 8.55957C10.2946 8.79848 9.9881 8.87999 9.74906 8.74219L9.13774 8.38965L9.2227 8.70312C9.29384 8.96959 9.13454 9.24383 8.86821 9.31543C8.60169 9.38654 8.3274 9.22834 8.2559 8.96191L7.91313 7.68164L6.49906 6.86523V8.49609L7.43754 9.43457C7.63246 9.62978 7.63246 9.94642 7.43754 10.1416C7.24232 10.3368 6.92575 10.3367 6.73051 10.1416L6.49906 9.91016V10.498C6.49906 10.7742 6.27519 10.998 5.99906 10.998C5.72305 10.9979 5.49906 10.7741 5.49906 10.498V9.91211L5.26957 10.1416C5.07441 10.3368 4.75785 10.3366 4.56254 10.1416C4.36745 9.94636 4.36738 9.6298 4.56254 9.43457L5.49906 8.49805V6.86523L4.085 7.68164L3.7432 8.96191C3.67158 9.22831 3.39743 9.38671 3.1309 9.31543C2.86449 9.24388 2.70621 8.96964 2.77738 8.70312L2.86039 8.38867L2.25004 8.74219C2.01109 8.88016 1.70567 8.79826 1.56742 8.55957C1.42933 8.32043 1.5109 8.01406 1.75004 7.87598L2.36137 7.52246L2.04789 7.43848C1.78131 7.36709 1.6223 7.09276 1.6934 6.82617C1.7649 6.55977 2.03921 6.40061 2.3057 6.47168L3.58695 6.81445L4.99906 5.99902L3.58598 5.18262L2.3057 5.52637C2.03919 5.59746 1.7649 5.43928 1.6934 5.17285C1.62219 4.90621 1.78126 4.63195 2.04789 4.56055L2.36137 4.47559L1.75004 4.12305C1.51106 3.98495 1.42949 3.6795 1.56742 3.44043C1.70555 3.2014 2.01095 3.11975 2.25004 3.25781L2.86137 3.61035L2.77738 3.29492C2.70652 3.02854 2.86462 2.75411 3.1309 2.68262C3.39744 2.61143 3.67167 2.77067 3.7432 3.03711L4.08598 4.31641L5.49906 5.13281V3.50098L4.56254 2.56445C4.36733 2.36918 4.3673 2.05265 4.56254 1.85742C4.75782 1.66228 5.07436 1.66221 5.26957 1.85742L5.49906 2.08691V1.5C5.49929 1.22414 5.72318 1.00015 5.99906 1Z"), + ) + }.build() + return _ic_snowflake_12!! + } + +@Composable +@Preview(showBackground = true) +private fun IcSnowflake12Preview() { + Icon( + imageVector = Icons.ic_snowflake_12, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcSnowflake20.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcSnowflake20.kt index d27bdad8a5..9de4bd7793 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcSnowflake20.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcSnowflake20.kt @@ -31,7 +31,7 @@ val Icons.ic_snowflake_20: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M10.0011 2.5C10.4149 2.50024 10.7509 2.83611 10.7511 3.25V4.18066L11.1749 3.77441C11.4736 3.48781 11.9486 3.49748 12.2354 3.7959C12.5221 4.0946 12.5124 4.56958 12.2139 4.85645L10.7511 6.25977V8.72461L13.0245 7.46387L13.5597 5.54785C13.6712 5.14923 14.0847 4.91518 14.4835 5.02637C14.882 5.13773 15.1148 5.55155 15.004 5.9502L14.8653 6.44336L15.8878 5.87793C16.2499 5.67781 16.7066 5.80896 16.9073 6.1709C17.1077 6.53284 16.9768 6.98943 16.6153 7.19043L15.672 7.71191L16.1632 7.83887C16.5639 7.94204 16.8057 8.35115 16.7032 8.75195C16.6002 9.15291 16.1911 9.39467 15.7901 9.29199L13.7618 8.77051L11.547 9.99707L13.7647 11.2256L15.7901 10.7061C16.1911 10.6034 16.6002 10.8452 16.7032 11.2461C16.8059 11.647 16.5639 12.056 16.1632 12.1592L15.6729 12.2842L16.6153 12.8066C16.9768 13.0076 17.1075 13.4642 16.9073 13.8262C16.7065 14.1882 16.2499 14.3186 15.8878 14.1182L14.8653 13.5508L15.004 14.0479C15.1149 14.4465 14.8821 14.8603 14.4835 14.9717C14.0847 15.0829 13.6711 14.8489 13.5597 14.4502L13.0235 12.5303L10.7511 11.2705V13.7354L12.2139 15.1396C12.5125 15.4264 12.522 15.9014 12.2354 16.2002C11.9486 16.4989 11.4737 16.5085 11.1749 16.2217L10.7511 15.8145V16.7461C10.7511 17.1602 10.4151 17.4959 10.0011 17.4961C9.58685 17.4961 9.25106 17.1603 9.25106 16.7461V15.8135L8.82625 16.2217C8.5275 16.5085 8.05259 16.4989 7.7657 16.2002C7.47919 15.9014 7.48855 15.4264 7.78719 15.1396L9.25106 13.7344V11.2715L6.9786 12.5303L6.44344 14.4502C6.33208 14.8488 5.91835 15.0826 5.51961 14.9717C5.12084 14.8604 4.88724 14.4466 4.99813 14.0479L5.13582 13.5508L4.11434 14.1182C3.75214 14.3188 3.29465 14.1883 3.09383 13.8262C2.89345 13.464 3.02566 13.0073 3.38778 12.8066L4.32918 12.2842L3.83992 12.1592C3.4389 12.0561 3.19708 11.6471 3.29988 11.2461C3.403 10.845 3.81187 10.6031 4.21297 10.7061L6.23836 11.2256L8.4532 9.99805L6.23934 8.77051L4.21297 9.29199C3.81187 9.39498 3.403 9.15304 3.29988 8.75195C3.19723 8.351 3.43898 7.94192 3.83992 7.83887L4.33016 7.71191L3.38778 7.19043C3.0256 6.9897 2.8933 6.53313 3.09383 6.1709C3.29462 5.80887 3.75216 5.67744 4.11434 5.87793L5.13582 6.44336L4.99813 5.9502C4.88739 5.55148 5.12092 5.13759 5.51961 5.02637C5.91827 4.91548 6.33201 5.14932 6.44344 5.54785L6.9786 7.46484L9.25106 8.72461V6.26074L7.78719 4.85645C7.48874 4.56953 7.47893 4.09457 7.7657 3.7959C8.05251 3.49741 8.52752 3.4879 8.82625 3.77441L9.25106 4.18164V3.25C9.25126 2.83596 9.58697 2.5 10.0011 2.5Z"), + pathData = addPathNodes("M10.0011 2.5C10.4149 2.50024 10.7509 2.83611 10.7511 3.25V4.18066L11.1749 3.77441C11.4736 3.48781 11.9486 3.49748 12.2354 3.7959C12.5221 4.0946 12.5124 4.56958 12.2139 4.85645L10.7511 6.25977V8.72461L13.0245 7.46387L13.5597 5.54785C13.6712 5.14923 14.0847 4.91518 14.4835 5.02637C14.882 5.13773 15.1148 5.55155 15.004 5.9502L14.8653 6.44336L15.8878 5.87793C16.2499 5.67781 16.7066 5.80896 16.9073 6.1709C17.1077 6.53284 16.9768 6.98943 16.6153 7.19043L15.672 7.71191L16.1632 7.83887C16.5639 7.94204 16.8057 8.35115 16.7032 8.75195C16.6002 9.15291 16.1911 9.39467 15.7901 9.29199L13.7618 8.77051L11.547 9.99707L13.7647 11.2256L15.7901 10.7061C16.1911 10.6034 16.6002 10.8452 16.7032 11.2461C16.8059 11.647 16.5639 12.056 16.1632 12.1592L15.6729 12.2842L16.6153 12.8066C16.9768 13.0076 17.1075 13.4642 16.9073 13.8262C16.7065 14.1882 16.2499 14.3186 15.8878 14.1182L14.8653 13.5508L15.004 14.0479C15.1149 14.4465 14.8821 14.8603 14.4835 14.9717C14.0847 15.0829 13.6711 14.8489 13.5597 14.4502L13.0235 12.5303L10.7511 11.2705V13.7354L12.2139 15.1396C12.5125 15.4264 12.522 15.9014 12.2354 16.2002C11.9486 16.4989 11.4737 16.5085 11.1749 16.2217L10.7511 15.8145V16.7461C10.7511 17.1602 10.4151 17.4958 10.0011 17.4961C9.58685 17.4961 9.25106 17.1603 9.25106 16.7461V15.8135L8.82625 16.2217C8.5275 16.5085 8.05259 16.4989 7.7657 16.2002C7.47919 15.9014 7.48855 15.4264 7.78719 15.1396L9.25106 13.7344V11.2715L6.9786 12.5303L6.44344 14.4502C6.33208 14.8488 5.91835 15.0826 5.51961 14.9717C5.12084 14.8604 4.88724 14.4466 4.99813 14.0479L5.13582 13.5508L4.11434 14.1182C3.75214 14.3188 3.29465 14.1883 3.09383 13.8262C2.89345 13.464 3.02566 13.0073 3.38778 12.8066L4.32918 12.2842L3.83992 12.1592C3.4389 12.0561 3.19708 11.6471 3.29988 11.2461C3.403 10.845 3.81187 10.6031 4.21297 10.7061L6.23836 11.2256L8.4532 9.99805L6.23934 8.77051L4.21297 9.29199C3.81187 9.39498 3.403 9.15304 3.29988 8.75195C3.19723 8.351 3.43898 7.94192 3.83992 7.83887L4.33016 7.71191L3.38778 7.19043C3.0256 6.9897 2.8933 6.53313 3.09383 6.1709C3.29462 5.80887 3.75216 5.67744 4.11434 5.87793L5.13582 6.44336L4.99813 5.9502C4.88739 5.55148 5.12092 5.13759 5.51961 5.02637C5.91827 4.91548 6.33201 5.14932 6.44344 5.54785L6.9786 7.46484L9.25106 8.72461V6.26074L7.78719 4.85645C7.48874 4.56953 7.47893 4.09457 7.7657 3.7959C8.05251 3.49741 8.52752 3.4879 8.82625 3.77441L9.25106 4.18164V3.25C9.25126 2.83596 9.58697 2.5 10.0011 2.5Z"), ) }.build() return _ic_snowflake_20!! diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcSnowflake24.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcSnowflake24.kt index 426f9a8266..65bbe5a46d 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcSnowflake24.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcSnowflake24.kt @@ -31,7 +31,7 @@ val Icons.ic_snowflake_24: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M11.9998 2C12.5521 2.00006 12.9998 2.44775 12.9998 3V4.1748L13.4608 3.71387C13.8511 3.32351 14.4843 3.3237 14.8748 3.71387C15.2652 4.1043 15.2651 4.73737 14.8748 5.12793L12.9998 7.00293V10.2666L15.8279 8.63281L16.5135 6.07422C16.6564 5.54089 17.2047 5.22438 17.7381 5.36719C18.2713 5.5102 18.5879 6.05848 18.4451 6.5918L18.2762 7.21973L19.4998 6.51367C19.978 6.23773 20.5898 6.40187 20.866 6.87988C21.142 7.35808 20.9779 7.96992 20.4998 8.24609L19.2752 8.95215L19.9061 9.12207C20.4393 9.26507 20.7559 9.81333 20.6131 10.3467C20.4702 10.88 19.9219 11.1964 19.3885 11.0537L16.826 10.3672L13.9988 11.999L16.826 13.6318L19.3885 12.9463C19.9219 12.8036 20.4702 13.12 20.6131 13.6533C20.7558 14.1866 20.4393 14.7349 19.9061 14.8779L19.2752 15.0459L20.4998 15.7539C20.978 16.0301 21.1422 16.6419 20.866 17.1201C20.5899 17.5982 19.978 17.7622 19.4998 17.4863L18.2762 16.7793L18.4451 17.4082C18.5878 17.9415 18.2713 18.4898 17.7381 18.6328C17.2047 18.7756 16.6564 18.4591 16.5135 17.9258L15.8279 15.3652L12.9998 13.7324V16.9961L14.8748 18.8721C15.2651 19.2626 15.2652 19.8957 14.8748 20.2861C14.4842 20.6763 13.8511 20.6765 13.4608 20.2861L12.9998 19.8242V21C12.9998 21.5522 12.5521 21.9999 11.9998 22C11.4477 21.9998 10.9998 21.5522 10.9998 21V19.8242L10.5389 20.2861C10.1484 20.6764 9.51533 20.6764 9.12482 20.2861C8.73455 19.8957 8.73468 19.2626 9.12482 18.8721L10.9998 16.9961V13.7324L8.1717 15.3643L7.48713 17.9258C7.34426 18.4591 6.79586 18.7754 6.26252 18.6328C5.7292 18.4899 5.41272 17.9416 5.55549 17.4082L5.72346 16.7793L4.49982 17.4863C4.02164 17.7622 3.40974 17.5982 3.13361 17.1201C2.85762 16.6419 3.02176 16.0301 3.49982 15.7539L4.72346 15.0459L4.09455 14.8779C3.56116 14.735 3.2447 14.1867 3.38752 13.6533C3.53045 13.1199 4.07869 12.8034 4.61213 12.9463L7.17267 13.6318L9.99885 11.999L7.17365 10.3672L4.61213 11.0537C4.07867 11.1966 3.53043 10.8801 3.38752 10.3467C3.24465 9.81323 3.56112 9.26498 4.09455 9.12207L4.72346 8.95312L3.49982 8.24609C3.02183 7.96986 2.85763 7.35803 3.13361 6.87988C3.40974 6.40181 4.02164 6.23784 4.49982 6.51367L5.72346 7.21973L5.55549 6.5918C5.41268 6.05838 5.72916 5.51011 6.26252 5.36719C6.79585 5.22457 7.34424 5.54095 7.48713 6.07422L8.1717 8.63379L10.9998 10.2666V7.00293L9.12482 5.12793C8.73467 4.73738 8.73452 4.10425 9.12482 3.71387C9.51532 3.32361 10.1484 3.32364 10.5389 3.71387L10.9998 4.1748V3C10.9998 2.44781 11.4477 2.00015 11.9998 2Z"), + pathData = addPathNodes("M11.9998 2C12.5521 2.00006 12.9998 2.44775 12.9998 3V4.1748L13.4608 3.71387C13.8511 3.32351 14.4843 3.3237 14.8748 3.71387C15.2652 4.1043 15.2651 4.73737 14.8748 5.12793L12.9998 7.00293V10.2666L15.8279 8.63281L16.5135 6.07422C16.6564 5.54089 17.2047 5.22438 17.7381 5.36719C18.2713 5.5102 18.5879 6.05848 18.4451 6.5918L18.2762 7.21973L19.4998 6.51367C19.978 6.23773 20.5898 6.40187 20.866 6.87988C21.142 7.35808 20.9779 7.96992 20.4998 8.24609L19.2752 8.95215L19.9061 9.12207C20.4393 9.26507 20.7559 9.81333 20.6131 10.3467C20.4702 10.88 19.9219 11.1964 19.3885 11.0537L16.826 10.3672L13.9988 11.999L16.826 13.6318L19.3885 12.9463C19.9219 12.8036 20.4702 13.12 20.6131 13.6533C20.7558 14.1866 20.4393 14.7349 19.9061 14.8779L19.2752 15.0459L20.4998 15.7539C20.978 16.0301 21.1422 16.6419 20.866 17.1201C20.5899 17.5982 19.978 17.7622 19.4998 17.4863L18.2762 16.7793L18.4451 17.4082C18.5878 17.9415 18.2713 18.4898 17.7381 18.6328C17.2047 18.7756 16.6564 18.4591 16.5135 17.9258L15.8279 15.3652L12.9998 13.7324V16.9961L14.8748 18.8721C15.2651 19.2626 15.2652 19.8957 14.8748 20.2861C14.4842 20.6763 13.8511 20.6765 13.4608 20.2861L12.9998 19.8242V21C12.9998 21.5522 12.5521 21.9999 11.9998 22C11.4477 21.9998 10.9998 21.5522 10.9998 21V19.8242L10.5389 20.2861C10.1484 20.6764 9.51533 20.6764 9.12482 20.2861C8.73455 19.8957 8.73468 19.2626 9.12482 18.8721L10.9998 16.9961V13.7324L8.1717 15.3643L7.48713 17.9258C7.34426 18.4591 6.79586 18.7754 6.26252 18.6328C5.7292 18.4899 5.41272 17.9416 5.55549 17.4082L5.72346 16.7793L4.49982 17.4863C4.02164 17.7622 3.40974 17.5982 3.13361 17.1201C2.85762 16.6419 3.02176 16.0301 3.49982 15.7539L4.72346 15.0459L4.09455 14.8779C3.56116 14.735 3.2447 14.1867 3.38752 13.6533C3.53045 13.1199 4.07869 12.8034 4.61213 12.9463L7.17267 13.6318L9.99885 11.999L7.17365 10.3672L4.61213 11.0537C4.07867 11.1966 3.53043 10.8801 3.38752 10.3467C3.24465 9.81323 3.56112 9.26498 4.09455 9.12207L4.72346 8.95312L3.49982 8.24609C3.02183 7.96986 2.85763 7.35803 3.13361 6.87988C3.40974 6.4018 4.02164 6.23784 4.49982 6.51367L5.72346 7.21973L5.55549 6.5918C5.41268 6.05838 5.72916 5.51011 6.26252 5.36719C6.79585 5.22457 7.34424 5.54095 7.48713 6.07422L8.1717 8.63379L10.9998 10.2666V7.00293L9.12482 5.12793C8.73467 4.73738 8.73452 4.10425 9.12482 3.71387C9.51532 3.32361 10.1484 3.32364 10.5389 3.71387L10.9998 4.1748V3C10.9998 2.44781 11.4477 2.00015 11.9998 2Z"), ) }.build() return _ic_snowflake_24!! diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcSnowflake28.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcSnowflake28.kt new file mode 100644 index 0000000000..e7f45bb1ee --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcSnowflake28.kt @@ -0,0 +1,47 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_snowflake_28: ImageVector? = null + +val Icons.ic_snowflake_28: ImageVector + get() { + if (_ic_snowflake_28 != null) return _ic_snowflake_28!! + _ic_snowflake_28 = ImageVector.Builder( + name = "ic_snowflake_28", + defaultWidth = 28.dp, + defaultHeight = 28.dp, + viewportWidth = 28f, + viewportHeight = 28f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M13.9993 2C14.6894 2.00029 15.2493 2.55982 15.2493 3.25V4.55957L15.7659 4.05371C16.2588 3.57068 17.0502 3.57868 17.5335 4.07129C18.0166 4.56423 18.0087 5.35561 17.5159 5.83887L15.2493 8.05957V11.8555L18.6399 9.93555L19.47 6.90137C19.6519 6.23549 20.3393 5.84266 21.0051 6.02441C21.671 6.20634 22.0629 6.89369 21.8811 7.55957L21.7053 8.20117L23.1331 7.39355C23.7337 7.05386 24.4961 7.26486 24.8362 7.86523C25.1758 8.46585 24.9649 9.22929 24.3645 9.56934L23.0012 10.3398L23.635 10.5068C24.3027 10.6822 24.7019 11.3655 24.5266 12.0332C24.3511 12.7006 23.6678 13.1 23.0003 12.9248L19.8821 12.1055L16.5364 13.999L19.8821 15.8926L23.0003 15.0742C23.668 14.8989 24.3513 15.2981 24.5266 15.9658C24.7017 16.6335 24.3026 17.3169 23.635 17.4922L23.0012 17.6582L24.3645 18.4297C24.9648 18.7699 25.1761 19.5332 24.8362 20.1338C24.4961 20.734 23.7336 20.9449 23.1331 20.6055L21.7053 19.7969L21.8811 20.4385C22.0628 21.1043 21.6709 21.7917 21.0051 21.9736C20.3394 22.1553 19.652 21.7633 19.47 21.0977L18.6399 18.0615L15.2493 16.1426V19.9365L17.5159 22.1582C18.0088 22.6414 18.0165 23.4328 17.5335 23.9258C17.0502 24.4186 16.2588 24.4266 15.7659 23.9434L15.2493 23.4365V24.749C15.249 25.439 14.6892 25.9987 13.9993 25.999C13.3091 25.999 12.7495 25.4392 12.7493 24.749V23.4355L12.2317 23.9434C11.7387 24.4264 10.9473 24.4187 10.4641 23.9258C9.98108 23.4329 9.98898 22.6414 10.4817 22.1582L12.7493 19.9346V16.1436L9.35572 18.0635L8.5276 21.0977C8.34549 21.7633 7.65824 22.1555 6.99244 21.9736C6.32674 21.7917 5.93482 21.1042 6.11647 20.4385L6.29029 19.7988L4.86647 20.6055C4.26592 20.9454 3.50263 20.734 3.16236 20.1338C2.82236 19.5331 3.03346 18.7698 3.63404 18.4297L4.99635 17.6582L4.36256 17.4922C3.69497 17.3169 3.29593 16.6334 3.47096 15.9658C3.64625 15.2981 4.32961 14.899 4.99733 15.0742L8.11549 15.8926L11.4612 13.999L8.11549 12.1055L4.99733 12.9248C4.3298 13.0999 3.64641 12.7006 3.47096 12.0332C3.29571 11.3656 3.69498 10.6822 4.36256 10.5068L4.99635 10.3398L3.63404 9.56934C3.03358 9.22922 2.82255 8.46588 3.16236 7.86523C3.50252 7.2647 4.26579 7.05356 4.86647 7.39355L6.29029 8.19922L6.11647 7.55957C5.93469 6.89373 6.32666 6.20639 6.99244 6.02441C7.6584 5.8425 8.34569 6.23541 8.5276 6.90137L9.35572 9.93457L12.7493 11.8545V8.06152L10.4817 5.83887C9.98904 5.35556 9.98096 4.56416 10.4641 4.07129C10.9473 3.57847 11.7387 3.57077 12.2317 4.05371L12.7493 4.56055V3.25C12.7493 2.55964 13.3089 2 13.9993 2Z"), + ) + }.build() + return _ic_snowflake_28!! + } + +@Composable +@Preview(showBackground = true) +private fun IcSnowflake28Preview() { + Icon( + imageVector = Icons.ic_snowflake_28, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcSun16.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcSun16.kt index 9e77e87061..bf90810ef1 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcSun16.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcSun16.kt @@ -46,7 +46,7 @@ val Icons.ic_sun_16: ImageVector addPath( fill = SolidColor(Color.Black), pathFillType = PathFillType.NonZero, - pathData = addPathNodes("M8.00098 5.41699C9.42763 5.41721 10.5839 6.57431 10.584 8.00098C10.5838 9.42764 9.42763 10.5838 8.00098 10.584C6.5743 10.5838 5.41713 9.42766 5.41699 8.00098C5.41712 6.57429 6.5743 5.41718 8.00098 5.41699ZM8.00098 6.66699C7.26474 6.66718 6.66712 7.26456 6.66699 8.00098C6.66713 8.73739 7.26474 9.3338 8.00098 9.33398C8.73718 9.33377 9.33385 8.73737 9.33398 8.00098C9.33385 7.26458 8.73719 6.66721 8.00098 6.66699Z"), + pathData = addPathNodes("M8.00098 5.41699C9.42763 5.41721 10.5839 6.57431 10.584 8.00098C10.5838 9.42764 9.42763 10.5838 8.00098 10.584C6.5743 10.5838 5.41713 9.42766 5.41699 8.00098C5.41712 6.57429 6.5743 5.41718 8.00098 5.41699ZM8.00098 6.66699C7.26474 6.66718 6.66712 7.26456 6.66699 8.00098C6.66713 8.73739 7.26474 9.3338 8.00098 9.33398C8.73719 9.33377 9.33385 8.73737 9.33398 8.00098C9.33385 7.26458 8.73719 6.66721 8.00098 6.66699Z"), ) addPath( fill = SolidColor(Color.Black), diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcSun28.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcSun28.kt new file mode 100644 index 0000000000..986153afbe --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcSun28.kt @@ -0,0 +1,87 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_sun_28: ImageVector? = null + +val Icons.ic_sun_28: ImageVector + get() { + if (_ic_sun_28 != null) return _ic_sun_28!! + _ic_sun_28 = ImageVector.Builder( + name = "ic_sun_28", + defaultWidth = 28.dp, + defaultHeight = 28.dp, + viewportWidth = 28f, + viewportHeight = 28f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M13.999 21.1104C14.6892 21.1104 15.2488 21.6702 15.249 22.3604V24.749C15.2488 25.4392 14.6892 25.999 13.999 25.999C13.309 25.9988 12.7493 25.439 12.749 24.749V22.3604C12.7493 21.6704 13.309 21.1106 13.999 21.1104Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M7.20312 19.0264C7.69107 18.5388 8.48261 18.539 8.9707 19.0264C9.45874 19.5144 9.45853 20.3067 8.9707 20.7949L7.28223 22.4834C6.79408 22.9716 6.00279 22.9716 5.51465 22.4834C5.02677 21.9952 5.02659 21.2039 5.51465 20.7158L7.20312 19.0264Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M19.0273 19.0264C19.5155 18.5385 20.3078 18.5383 20.7959 19.0264L22.4844 20.7158C22.9721 21.2039 22.9721 21.9953 22.4844 22.4834C21.9963 22.9715 21.205 22.9712 20.7168 22.4834L19.0273 20.7949C18.5393 20.3068 18.5392 19.5145 19.0273 19.0264Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.EvenOdd, + pathData = addPathNodes("M14 9.16602C16.669 9.16628 18.8329 11.33 18.833 13.999C18.8329 16.6681 16.669 18.8318 14 18.832C11.3308 18.832 9.16707 16.6682 9.16699 13.999C9.1671 11.3299 11.3308 9.16605 14 9.16602ZM14 11.666C12.7116 11.666 11.6671 12.7105 11.667 13.999C11.6671 15.2876 12.7116 16.332 14 16.332C15.2882 16.3318 16.3329 15.2874 16.333 13.999C16.3329 12.7106 15.2882 11.6663 14 11.666Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M5.63867 12.748C6.32858 12.7483 6.88828 13.3082 6.88867 13.998C6.88867 14.6883 6.32882 15.2478 5.63867 15.248H3.25C2.55976 15.2479 2 14.6883 2 13.998C2.00039 13.3081 2.56 12.7482 3.25 12.748H5.63867Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M24.749 12.748C25.4388 12.7484 25.9986 13.3083 25.999 13.998C25.999 14.6882 25.4391 15.2477 24.749 15.248H22.3604C21.67 15.248 21.1104 14.6884 21.1104 13.998C21.1107 13.308 21.6702 12.748 22.3604 12.748H24.749Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M5.51465 5.51367C6.00282 5.02577 6.79515 5.0256 7.2832 5.51367L8.97168 7.20312C9.45925 7.69124 9.4594 8.48268 8.97168 8.9707C8.48367 9.45856 7.69223 9.45836 7.2041 8.9707L5.51465 7.28125C5.02685 6.79314 5.02682 6.00177 5.51465 5.51367Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M20.7158 5.51367C21.2038 5.02598 21.9953 5.02608 22.4834 5.51367C22.9714 6.00173 22.9712 6.79306 22.4834 7.28125L20.7949 8.9707C20.3068 9.4588 19.5155 9.45865 19.0273 8.9707C18.5395 8.48252 18.5393 7.6912 19.0273 7.20312L20.7158 5.51367Z"), + ) + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M13.999 2C14.6892 2 15.2488 2.55985 15.249 3.25V5.63867C15.2488 6.32888 14.6893 6.88867 13.999 6.88867C13.309 6.8884 12.7492 6.32871 12.749 5.63867V3.25C12.7493 2.56002 13.309 2.00027 13.999 2Z"), + ) + }.build() + return _ic_sun_28!! + } + +@Composable +@Preview(showBackground = true) +private fun IcSun28Preview() { + Icon( + imageVector = Icons.ic_sun_28, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcTrashBin12.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcTrashBin12.kt new file mode 100644 index 0000000000..3a1eebf071 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcTrashBin12.kt @@ -0,0 +1,47 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_trash_bin_12: ImageVector? = null + +val Icons.ic_trash_bin_12: ImageVector + get() { + if (_ic_trash_bin_12 != null) return _ic_trash_bin_12!! + _ic_trash_bin_12 = ImageVector.Builder( + name = "ic_trash_bin_12", + defaultWidth = 12.dp, + defaultHeight = 12.dp, + viewportWidth = 12f, + viewportHeight = 12f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M6.97266 1C7.72075 1.00051 8.32402 1.60894 8.32422 2.35449V2.70215H9.87891C10.224 2.70215 10.5038 2.98209 10.5039 3.32715C10.5039 3.67232 10.2241 3.95215 9.87891 3.95215H9.77832V9.40527C9.77832 10.2855 9.06597 11.0028 8.18359 11.0029H3.82227C2.93977 11.0029 2.22754 10.2856 2.22754 9.40527V3.95215H2.125C1.77994 3.95202 1.50001 3.67224 1.5 3.32715C1.50014 2.98217 1.78002 2.70228 2.125 2.70215H3.68164V2.35449C3.68184 1.60876 4.28486 1.00022 5.0332 1H6.97266ZM3.47754 9.40527C3.47754 9.59922 3.63411 9.75293 3.82227 9.75293H8.18359C8.37164 9.7528 8.52832 9.59914 8.52832 9.40527V3.95215H3.47754V9.40527ZM5.0332 2.25C4.97916 2.25022 4.93184 2.29516 4.93164 2.35449V2.70215H7.07422V2.35449C7.07402 2.29536 7.02648 2.25052 6.97266 2.25H5.0332Z"), + ) + }.build() + return _ic_trash_bin_12!! + } + +@Composable +@Preview(showBackground = true) +private fun IcTrashBin12Preview() { + Icon( + imageVector = Icons.ic_trash_bin_12, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcTrashBin16.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcTrashBin16.kt new file mode 100644 index 0000000000..98c2982d15 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcTrashBin16.kt @@ -0,0 +1,47 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_trash_bin_16: ImageVector? = null + +val Icons.ic_trash_bin_16: ImageVector + get() { + if (_ic_trash_bin_16 != null) return _ic_trash_bin_16!! + _ic_trash_bin_16 = ImageVector.Builder( + name = "ic_trash_bin_16", + defaultWidth = 16.dp, + defaultHeight = 16.dp, + viewportWidth = 16f, + viewportHeight = 16f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M9.34277 1.5C10.2274 1.50021 10.9746 2.20188 10.9746 3.10449V3.78516H13.374C13.7189 3.78539 13.9989 4.06525 13.999 4.41016C13.9988 4.75499 13.7189 5.03492 13.374 5.03516H12.9912V12.5713C12.9911 13.6541 12.0925 14.5017 11.0225 14.502H4.97656C3.90634 14.502 3.00795 13.6542 3.00781 12.5713V5.03516H2.625C2.27997 5.03516 2.00024 4.75513 2 4.41016C2.00015 4.06511 2.27992 3.78516 2.625 3.78516H5.02246V3.10449C5.02246 2.20182 5.77059 1.50013 6.65527 1.5H9.34277ZM4.25781 12.5713C4.25795 12.9305 4.56286 13.252 4.97656 13.252H11.0225C11.4359 13.2517 11.7411 12.9304 11.7412 12.5713V5.03516H4.25781V12.5713ZM6.65527 2.75C6.42712 2.75013 6.27246 2.92553 6.27246 3.10449V3.78516H9.72461V3.10449C9.72461 2.92557 9.57084 2.7502 9.34277 2.75H6.65527Z"), + ) + }.build() + return _ic_trash_bin_16!! + } + +@Composable +@Preview(showBackground = true) +private fun IcTrashBin16Preview() { + Icon( + imageVector = Icons.ic_trash_bin_16, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcTrashBin20.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcTrashBin20.kt new file mode 100644 index 0000000000..0241133ce9 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcTrashBin20.kt @@ -0,0 +1,47 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_trash_bin_20: ImageVector? = null + +val Icons.ic_trash_bin_20: ImageVector + get() { + if (_ic_trash_bin_20 != null) return _ic_trash_bin_20!! + _ic_trash_bin_20 = ImageVector.Builder( + name = "ic_trash_bin_20", + defaultWidth = 20.dp, + defaultHeight = 20.dp, + viewportWidth = 20f, + viewportHeight = 20f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M11.5625 2C12.6456 2 13.4844 2.89922 13.4844 3.95898V4.82031H16.251C16.665 4.82055 17.001 5.15626 17.001 5.57031C17.0008 5.98419 16.6649 6.32008 16.251 6.32031H15.8291V15.6426C15.8289 16.9246 14.8152 18.0046 13.5166 18.0049H6.48438C5.18564 18.0048 4.17204 16.9247 4.17188 15.6426V6.32031H3.75C3.33592 6.32031 3.00022 5.98434 3 5.57031C3.00001 5.15611 3.33579 4.82031 3.75 4.82031H6.51562V3.95898C6.51562 2.89933 7.35451 2.00018 8.4375 2H11.5625ZM5.67188 15.6426C5.67204 16.1403 6.05739 16.5048 6.48438 16.5049H13.5166C13.9434 16.5046 14.3289 16.1401 14.3291 15.6426V6.32031H5.67188V15.6426ZM8.4375 3.5C8.22625 3.50018 8.01562 3.68376 8.01562 3.95898V4.82031H11.9844V3.95898C11.9844 3.68362 11.7739 3.5 11.5625 3.5H8.4375Z"), + ) + }.build() + return _ic_trash_bin_20!! + } + +@Composable +@Preview(showBackground = true) +private fun IcTrashBin20Preview() { + Icon( + imageVector = Icons.ic_trash_bin_20, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcTrashBin24.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcTrashBin24.kt new file mode 100644 index 0000000000..990132d129 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcTrashBin24.kt @@ -0,0 +1,47 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_trash_bin_24: ImageVector? = null + +val Icons.ic_trash_bin_24: ImageVector + get() { + if (_ic_trash_bin_24 != null) return _ic_trash_bin_24!! + _ic_trash_bin_24 = ImageVector.Builder( + name = "ic_trash_bin_24", + defaultWidth = 24.dp, + defaultHeight = 24.dp, + viewportWidth = 24f, + viewportHeight = 24f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M14 2C15.3807 2 16.5 3.11929 16.5 4.5V5.5H20C20.5523 5.5 21 5.94772 21 6.5C21 7.05228 20.5523 7.5 20 7.5H19.5V19C19.5 20.6569 18.1569 22 16.5 22H7.5C5.84315 22 4.5 20.6569 4.5 19V7.5H4C3.44772 7.5 3 7.05228 3 6.5C3 5.94772 3.44772 5.5 4 5.5H7.5V4.5C7.5 3.11929 8.61929 2 10 2H14ZM6.5 19C6.5 19.5523 6.94772 20 7.5 20H16.5C17.0523 20 17.5 19.5523 17.5 19V7.5H6.5V19ZM10 4C9.72386 4 9.5 4.22386 9.5 4.5V5.5H14.5V4.5C14.5 4.22386 14.2761 4 14 4H10Z"), + ) + }.build() + return _ic_trash_bin_24!! + } + +@Composable +@Preview(showBackground = true) +private fun IcTrashBin24Preview() { + Icon( + imageVector = Icons.ic_trash_bin_24, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcTrashBin28.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcTrashBin28.kt new file mode 100644 index 0000000000..c5425d7308 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcTrashBin28.kt @@ -0,0 +1,47 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_trash_bin_28: ImageVector? = null + +val Icons.ic_trash_bin_28: ImageVector + get() { + if (_ic_trash_bin_28 != null) return _ic_trash_bin_28!! + _ic_trash_bin_28 = ImageVector.Builder( + name = "ic_trash_bin_28", + defaultWidth = 28.dp, + defaultHeight = 28.dp, + viewportWidth = 28f, + viewportHeight = 28f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M16.3135 2C17.9434 2.00012 19.2974 3.30677 19.2979 4.95801V5.98633H23.252C23.9419 5.98659 24.5016 6.54642 24.502 7.23633C24.502 7.92652 23.9421 8.48606 23.252 8.48633H22.7676V21.4727C22.7676 23.4387 21.1545 25.0006 19.2051 25.001H8.79688C6.84731 25.0008 5.23438 23.4388 5.23438 21.4727V8.48633H4.75C4.05964 8.48633 3.5 7.92668 3.5 7.23633C3.50033 6.54626 4.05985 5.98633 4.75 5.98633H8.70312V4.95801C8.70361 3.30676 10.0575 2.00011 11.6875 2H16.3135ZM7.73438 21.4727C7.73438 22.0224 8.19208 22.5008 8.79688 22.501H19.2051C19.8097 22.5006 20.2676 22.0223 20.2676 21.4727V8.48633H7.73438V21.4727ZM11.6875 4.5C11.4024 4.50011 11.2036 4.72306 11.2031 4.95801V5.98633H16.7979V4.95801C16.7974 4.72306 16.5986 4.50012 16.3135 4.5H11.6875Z"), + ) + }.build() + return _ic_trash_bin_28!! + } + +@Composable +@Preview(showBackground = true) +private fun IcTrashBin28Preview() { + Icon( + imageVector = Icons.ic_trash_bin_28, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcWallet16.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcWallet16.kt new file mode 100644 index 0000000000..0cd6fb2914 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcWallet16.kt @@ -0,0 +1,47 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_wallet_16: ImageVector? = null + +val Icons.ic_wallet_16: ImageVector + get() { + if (_ic_wallet_16 != null) return _ic_wallet_16!! + _ic_wallet_16 = ImageVector.Builder( + name = "ic_wallet_16", + defaultWidth = 16.dp, + defaultHeight = 16.dp, + viewportWidth = 16f, + viewportHeight = 16f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M12.1094 3C13.1045 3.00018 13.999 3.75613 13.999 4.79199V11.209C13.999 12.2448 13.1045 13.0008 12.1094 13.001H3.88965C2.89442 13.001 2.00007 12.2449 2 11.209V4.79199C2 3.75601 2.89438 3 3.88965 3H12.1094ZM3.25 11.209C3.25008 11.4618 3.48817 11.751 3.88965 11.751H12.1094C12.5106 11.7508 12.7489 11.4617 12.749 11.209V10.668H11.4766C10.4816 10.6678 9.58724 9.91158 9.58691 8.87598C9.58691 7.84008 10.4814 7.08411 11.4766 7.08398H12.749V6.58398H3.88965C3.66831 6.58398 3.45263 6.54317 3.25 6.47363V11.209ZM11.4766 8.33398C11.0752 8.3341 10.8369 8.62322 10.8369 8.87598C10.8373 9.12859 11.0755 9.41785 11.4766 9.41797H12.749V8.33398H11.4766ZM3.88965 4.25C3.48811 4.25 3.25 4.53919 3.25 4.79199L3.26074 4.8877C3.31186 5.11231 3.53839 5.33398 3.88965 5.33398H12.749V4.79199C12.749 4.53926 12.5107 4.25017 12.1094 4.25H3.88965Z"), + ) + }.build() + return _ic_wallet_16!! + } + +@Composable +@Preview(showBackground = true) +private fun IcWallet16Preview() { + Icon( + imageVector = Icons.ic_wallet_16, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcWallet20.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcWallet20.kt new file mode 100644 index 0000000000..e6f143fffd --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcWallet20.kt @@ -0,0 +1,47 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_wallet_20: ImageVector? = null + +val Icons.ic_wallet_20: ImageVector + get() { + if (_ic_wallet_20 != null) return _ic_wallet_20!! + _ic_wallet_20 = ImageVector.Builder( + name = "ic_wallet_20", + defaultWidth = 20.dp, + defaultHeight = 20.dp, + viewportWidth = 20f, + viewportHeight = 20f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M15.5439 3C16.8835 3.00026 18 4.06618 18 5.41699V14.583C17.9996 15.9335 16.8833 16.9988 15.5439 16.999H4.45703C3.1175 16.999 2.00037 15.9337 2 14.583V5.41699C2 4.06602 3.11728 3 4.45703 3H15.5439ZM3.50098 14.583C3.50135 15.0726 3.91289 15.499 4.45703 15.499H15.5439C16.0878 15.4988 16.4996 15.0724 16.5 14.583V13.666H14.6914C13.3519 13.666 12.2358 12.6006 12.2354 11.25C12.2354 9.89902 13.3517 8.83301 14.6914 8.83301H16.5V7.83301H4.45703C4.11954 7.83301 3.79581 7.76437 3.50098 7.6416V14.583ZM14.6914 10.333C14.147 10.333 13.7354 10.7601 13.7354 11.25C13.7358 11.7395 14.1473 12.166 14.6914 12.166H16.5V10.333H14.6914ZM4.45703 4.5C3.91264 4.5 3.50098 4.92713 3.50098 5.41699L3.50586 5.50781C3.55335 5.95804 3.9469 6.33301 4.45703 6.33301H16.5V5.41699C16.5 4.92728 16.0881 4.50026 15.5439 4.5H4.45703Z"), + ) + }.build() + return _ic_wallet_20!! + } + +@Composable +@Preview(showBackground = true) +private fun IcWallet20Preview() { + Icon( + imageVector = Icons.ic_wallet_20, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcWallet24.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcWallet24.kt new file mode 100644 index 0000000000..e91433b2c6 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcWallet24.kt @@ -0,0 +1,47 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_wallet_24: ImageVector? = null + +val Icons.ic_wallet_24: ImageVector + get() { + if (_ic_wallet_24 != null) return _ic_wallet_24!! + _ic_wallet_24 = ImageVector.Builder( + name = "ic_wallet_24", + defaultWidth = 24.dp, + defaultHeight = 24.dp, + viewportWidth = 24f, + viewportHeight = 24f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M18.8809 3C20.6094 3 21.9979 4.40955 21.998 6.13281V11.4482C21.9981 11.4541 21.999 11.46 21.999 11.4658C21.999 11.4714 21.9981 11.4769 21.998 11.4824V15.7148C21.9981 15.7207 21.999 15.7266 21.999 15.7324C21.999 15.738 21.9981 15.7435 21.998 15.749V17.8652C21.9979 19.5885 20.6094 20.999 18.8809 20.999H5.11719C3.38873 20.9989 2.00014 19.5884 2 17.8652V6.13281C2.00018 4.40964 3.38875 3.00015 5.11719 3H18.8809ZM4 17.8652C4.00014 18.4978 4.50718 18.9989 5.11719 18.999H18.8809C19.491 18.999 19.9979 18.4979 19.998 17.8652V16.7324H17.8223C16.0937 16.7323 14.7051 15.3219 14.7051 13.5986C14.7053 11.8755 16.0938 10.466 17.8223 10.4658H19.998V9.2666H5.11719C4.72279 9.26657 4.34655 9.19139 4 9.05762V17.8652ZM17.8223 12.4658C17.2123 12.466 16.7053 12.9661 16.7051 13.5986C16.7051 14.2313 17.2122 14.7323 17.8223 14.7324H19.998V12.4658H17.8223ZM5.11719 5C4.50721 5.00015 4.00018 5.50027 4 6.13281C4.00014 6.76538 4.50718 7.26645 5.11719 7.2666H19.998V6.13281C19.9979 5.50018 19.491 5 18.8809 5H5.11719Z"), + ) + }.build() + return _ic_wallet_24!! + } + +@Composable +@Preview(showBackground = true) +private fun IcWallet24Preview() { + Icon( + imageVector = Icons.ic_wallet_24, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcWallet28.kt b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcWallet28.kt new file mode 100644 index 0000000000..e896f73775 --- /dev/null +++ b/core/ui/src/main/java/com/tangem/core/ui/res/generated/icons/IcWallet28.kt @@ -0,0 +1,47 @@ +@file:Suppress("all") + +package com.tangem.core.ui.res.generated.icons + +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp + +/** + * Auto-generated from design tokens. Do not edit manually. + */ + +private var _ic_wallet_28: ImageVector? = null + +val Icons.ic_wallet_28: ImageVector + get() { + if (_ic_wallet_28 != null) return _ic_wallet_28!! + _ic_wallet_28 = ImageVector.Builder( + name = "ic_wallet_28", + defaultWidth = 28.dp, + defaultHeight = 28.dp, + viewportWidth = 28f, + viewportHeight = 28f, + ).apply { + addPath( + fill = SolidColor(Color.Black), + pathFillType = PathFillType.NonZero, + pathData = addPathNodes("M21.4561 4C23.4333 4.00015 25 5.62509 25 7.58398V20.4189C24.9997 22.3776 23.4332 24.0028 21.4561 24.0029H6.54395C4.56679 24.0028 3.00027 22.3776 3 20.4189V7.58398C3 5.62506 4.56662 4.0001 6.54395 4H21.4561ZM5.5 20.4189C5.50027 21.0373 5.98757 21.5028 6.54395 21.5029H21.4561C22.0124 21.5028 22.4997 21.0373 22.5 20.4189V19.334H20.3086C18.3315 19.3337 16.7648 17.7097 16.7646 15.751C16.7649 13.7923 18.3315 12.1672 20.3086 12.167H22.5V11.167H6.54395C6.17972 11.167 5.82913 11.112 5.5 11.0098V20.4189ZM20.3086 14.667C19.7523 14.6672 19.2649 15.1327 19.2646 15.751C19.2648 16.3694 19.7523 16.8337 20.3086 16.834H22.5V14.667H20.3086ZM6.54395 6.5C5.98741 6.50011 5.5 6.96534 5.5 7.58398L5.50586 7.69824C5.56185 8.2586 6.02248 8.66689 6.54395 8.66699H22.5V7.58398C22.5 6.96537 22.0126 6.50015 21.4561 6.5H6.54395Z"), + ) + }.build() + return _ic_wallet_28!! + } + +@Composable +@Preview(showBackground = true) +private fun IcWallet28Preview() { + Icon( + imageVector = Icons.ic_wallet_28, + contentDescription = null, + ) +} \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_address_book_24.xml b/core/ui/src/main/res/drawable/ic_address_book_24.xml new file mode 100644 index 0000000000..ce54ca1a63 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_address_book_24.xml @@ -0,0 +1,25 @@ + + + + diff --git a/core/ui/src/main/res/drawable/ic_contact_20.xml b/core/ui/src/main/res/drawable/ic_contact_20.xml deleted file mode 100644 index b6d762b21b..0000000000 --- a/core/ui/src/main/res/drawable/ic_contact_20.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/data/address-book/build.gradle.kts b/data/address-book/build.gradle.kts new file mode 100644 index 0000000000..734a559f8c --- /dev/null +++ b/data/address-book/build.gradle.kts @@ -0,0 +1,42 @@ +plugins { + alias(deps.plugins.android.library) + alias(deps.plugins.kotlin.android) + alias(deps.plugins.kotlin.kapt) + alias(deps.plugins.kotlin.serialization) + id("configuration") +} + +android { + namespace = "com.tangem.data.addressbook" +} + +dependencies { + // region Project - Core + implementation(projects.core.datasource) + implementation(projects.core.utils) + // endregion + + // region Project - Domain + implementation(projects.domain.addressBook) + implementation(projects.domain.common) + implementation(projects.domain.models) + // endregion + + // region SDK + implementation(deps.androidx.datastore) + implementation(deps.arrow.core) + implementation(deps.jodatime) + implementation(deps.kotlin.coroutines) + implementation(deps.kotlin.serialization) + // endregion + + // region DI + implementation(deps.hilt.android) + kapt(deps.hilt.kapt) + // endregion + + // region Testing + testImplementation(projects.test.core) + testImplementation(deps.moshi.kotlin) + // endregion +} \ No newline at end of file diff --git a/data/address-book/src/main/kotlin/com/tangem/data/addressbook/DefaultAddressBookRepository.kt b/data/address-book/src/main/kotlin/com/tangem/data/addressbook/DefaultAddressBookRepository.kt new file mode 100644 index 0000000000..8ce2414259 --- /dev/null +++ b/data/address-book/src/main/kotlin/com/tangem/data/addressbook/DefaultAddressBookRepository.kt @@ -0,0 +1,116 @@ +package com.tangem.data.addressbook + +import com.tangem.data.addressbook.store.AddressBookBlobStore +import com.tangem.domain.addressbook.crypto.AddressBookCipher +import com.tangem.domain.addressbook.model.AddressBook +import com.tangem.domain.addressbook.model.AddressBookBlob +import com.tangem.domain.addressbook.model.Contact +import com.tangem.domain.addressbook.model.ContactId +import com.tangem.domain.addressbook.repository.AddressBookRepository +import com.tangem.domain.addressbook.time.IsoTimestampProvider +import com.tangem.domain.common.wallets.UserWalletsListRepository +import com.tangem.domain.models.wallet.UserWallet +import com.tangem.domain.models.wallet.UserWalletId +import com.tangem.utils.coroutines.CoroutineDispatcherProvider +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.filterNotNull +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.sync.Mutex +import kotlinx.coroutines.sync.withLock +import kotlinx.coroutines.withContext +import org.joda.time.DateTime + +internal class DefaultAddressBookRepository( + private val blobStore: AddressBookBlobStore, + private val cipher: AddressBookCipher, + private val userWalletsListRepository: UserWalletsListRepository, + private val timestampProvider: IsoTimestampProvider, + private val dispatchers: CoroutineDispatcherProvider, +) : AddressBookRepository { + + private val writeMutex = Mutex() + + override fun getContacts(userWalletId: UserWalletId): Flow> { + return getContactsForWallet(userWalletId) + .distinctUntilChanged() + .flowOn(dispatchers.default) + } + + @OptIn(ExperimentalCoroutinesApi::class) + override fun getAllContacts(): Flow> { + return userWalletsListRepository.userWallets + .filterNotNull() + .flatMapLatest { wallets -> + val walletsById = wallets.associateBy { it.walletId.stringValue } + val ids = wallets.mapTo(mutableSetOf()) { it.walletId } + blobStore.getBlobs(ids).map { blobs -> + blobs.flatMap { blob -> + walletsById[blob.walletId]?.let { userWallet -> + decryptContacts(blob, userWallet) + }.orEmpty() + } + } + } + .distinctUntilChanged() + .flowOn(dispatchers.default) + } + + private fun getContactsForWallet(userWalletId: UserWalletId): Flow> { + return blobStore.getBlob(userWalletId).map { blob -> + val userWallet = blob?.let { findUserWallet(it.walletId) } ?: return@map emptyList() + decryptContacts(blob, userWallet) + } + } + + override suspend fun getContact(userWalletId: UserWalletId, name: String): Contact? = + withContext(dispatchers.default) { + val blob = blobStore.getBlobSync(userWalletId) ?: return@withContext null + val userWallet = findUserWallet(blob.walletId) ?: return@withContext null + decryptContacts(blob, userWallet).find { it.name.value == name } + } + + override suspend fun saveContact(contact: Contact) = withContext(dispatchers.default) { + writeMutex.withLock { + val userWallet = findUserWallet(contact.walletId.stringValue) ?: return@withLock + val current = currentContacts(contact.walletId, userWallet) + val merged = current.filterNot { it.id == contact.id } + contact + persist(userWallet, AddressBook(walletId = contact.walletId, contacts = merged)) + } + } + + override suspend fun deleteContact(id: ContactId) = withContext(dispatchers.default) { + writeMutex.withLock { + userWalletsListRepository.userWalletsSync().forEach { userWallet -> + val blob = blobStore.getBlobSync(userWallet.walletId) ?: return@forEach + val addressBook = cipher.decrypt(blob, userWallet).getOrNull() ?: return@forEach + if (addressBook.contacts.none { it.id == id }) return@forEach + + val remaining = addressBook.contacts.filterNot { it.id == id } + persist(userWallet, addressBook.copy(contacts = remaining)) + return@withLock + } + } + } + + private fun decryptContacts(blob: AddressBookBlob, userWallet: UserWallet): List { + return cipher.decrypt(blob, userWallet).getOrNull()?.contacts.orEmpty() + } + + private suspend fun currentContacts(userWalletId: UserWalletId, userWallet: UserWallet): List { + val blob = blobStore.getBlobSync(userWalletId) ?: return emptyList() + return decryptContacts(blob, userWallet) + } + + private suspend fun persist(userWallet: UserWallet, addressBook: AddressBook) { + val updatedAt = DateTime.parse(timestampProvider.now()) + cipher.encrypt(addressBook, userWallet, updatedAt) + .onRight { blobStore.storeBlob(it) } + } + + private suspend fun findUserWallet(walletId: String): UserWallet? = + userWalletsListRepository.userWalletsSync().find { it.walletId.stringValue == walletId } +} \ No newline at end of file diff --git a/data/address-book/src/main/kotlin/com/tangem/data/addressbook/di/AddressBookDataModule.kt b/data/address-book/src/main/kotlin/com/tangem/data/addressbook/di/AddressBookDataModule.kt new file mode 100644 index 0000000000..ce181b3417 --- /dev/null +++ b/data/address-book/src/main/kotlin/com/tangem/data/addressbook/di/AddressBookDataModule.kt @@ -0,0 +1,68 @@ +package com.tangem.data.addressbook.di + +import android.content.Context +import androidx.datastore.core.DataStoreFactory +import androidx.datastore.dataStoreFile +import com.tangem.data.addressbook.DefaultAddressBookRepository +import com.tangem.data.addressbook.store.AddressBookBlobStore +import com.tangem.data.addressbook.store.DefaultAddressBookBlobStore +import com.tangem.data.addressbook.store.StoredAddressBookBlob +import com.tangem.datasource.utils.KotlinxDataStoreSerializer +import com.tangem.domain.addressbook.crypto.AddressBookCipher +import com.tangem.domain.addressbook.repository.AddressBookRepository +import com.tangem.domain.addressbook.time.IsoTimestampProvider +import com.tangem.domain.common.wallets.UserWalletsListRepository +import com.tangem.utils.coroutines.AppCoroutineScope +import com.tangem.utils.coroutines.CoroutineDispatcherProvider +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.android.qualifiers.ApplicationContext +import dagger.hilt.components.SingletonComponent +import kotlinx.serialization.builtins.MapSerializer +import kotlinx.serialization.builtins.serializer +import javax.inject.Singleton + +@Module +@InstallIn(SingletonComponent::class) +internal object AddressBookDataModule { + + @Provides + @Singleton + fun provideAddressBookBlobStore( + @ApplicationContext context: Context, + appScope: AppCoroutineScope, + ): AddressBookBlobStore { + return DefaultAddressBookBlobStore( + dataStore = DataStoreFactory.create( + serializer = KotlinxDataStoreSerializer( + defaultValue = emptyMap(), + serializer = MapSerializer( + keySerializer = String.serializer(), + valueSerializer = StoredAddressBookBlob.serializer(), + ), + ), + produceFile = { context.dataStoreFile(fileName = "address_book_blobs") }, + scope = appScope, + ), + ) + } + + @Provides + @Singleton + fun provideAddressBookRepository( + blobStore: AddressBookBlobStore, + cipher: AddressBookCipher, + userWalletsListRepository: UserWalletsListRepository, + timestampProvider: IsoTimestampProvider, + dispatchers: CoroutineDispatcherProvider, + ): AddressBookRepository { + return DefaultAddressBookRepository( + blobStore = blobStore, + cipher = cipher, + userWalletsListRepository = userWalletsListRepository, + timestampProvider = timestampProvider, + dispatchers = dispatchers, + ) + } +} \ No newline at end of file diff --git a/data/address-book/src/main/kotlin/com/tangem/data/addressbook/store/AddressBookBlobStore.kt b/data/address-book/src/main/kotlin/com/tangem/data/addressbook/store/AddressBookBlobStore.kt new file mode 100644 index 0000000000..de3e180d81 --- /dev/null +++ b/data/address-book/src/main/kotlin/com/tangem/data/addressbook/store/AddressBookBlobStore.kt @@ -0,0 +1,25 @@ +package com.tangem.data.addressbook.store + +import com.tangem.domain.addressbook.model.AddressBookBlob +import com.tangem.domain.models.wallet.UserWalletId +import kotlinx.coroutines.flow.Flow + +interface AddressBookBlobStore { + + fun getBlob(userWalletId: UserWalletId): Flow + + fun getBlobs(userWalletIds: Set): Flow> + + suspend fun getBlobSync(userWalletId: UserWalletId): AddressBookBlob? + + /** Persists [blob] optimistically with `isBESynchronized = false`. Keyed by [AddressBookBlob.walletId]. */ + suspend fun storeBlob(blob: AddressBookBlob) + + /** Flips the BE-sync flag to `true` once the backend confirms the push. No-op if the blob is absent. */ + suspend fun markAsSynchronized(userWalletId: UserWalletId) + + /** Blobs still pending a backend push — the entry point for the future sync service. */ + suspend fun getUnsynchronizedBlobs(): List + + suspend fun deleteBlob(userWalletId: UserWalletId) +} \ No newline at end of file diff --git a/data/address-book/src/main/kotlin/com/tangem/data/addressbook/store/DefaultAddressBookBlobStore.kt b/data/address-book/src/main/kotlin/com/tangem/data/addressbook/store/DefaultAddressBookBlobStore.kt new file mode 100644 index 0000000000..8aa6c8558e --- /dev/null +++ b/data/address-book/src/main/kotlin/com/tangem/data/addressbook/store/DefaultAddressBookBlobStore.kt @@ -0,0 +1,58 @@ +package com.tangem.data.addressbook.store + +import androidx.datastore.core.DataStore +import com.tangem.domain.addressbook.model.AddressBookBlob +import com.tangem.domain.models.wallet.UserWalletId +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.map + +internal typealias AddressBookBlobs = Map + +internal class DefaultAddressBookBlobStore( + private val dataStore: DataStore, +) : AddressBookBlobStore { + + override fun getBlob(userWalletId: UserWalletId): Flow { + return dataStore.data + .map { it[userWalletId.stringValue]?.blob } + .distinctUntilChanged() + } + + override fun getBlobs(userWalletIds: Set): Flow> { + val ids = userWalletIds.mapTo(mutableSetOf()) { it.stringValue } + return dataStore.data + .map { stored -> stored.filterKeys { it in ids }.values.map { it.blob } } + .distinctUntilChanged() + } + + override suspend fun getBlobSync(userWalletId: UserWalletId): AddressBookBlob? { + return getStoredBlobs()[userWalletId.stringValue]?.blob + } + + override suspend fun storeBlob(blob: AddressBookBlob) { + dataStore.updateData { stored -> + stored + (blob.walletId to StoredAddressBookBlob(blob = blob, isBESynchronized = false)) + } + } + + override suspend fun markAsSynchronized(userWalletId: UserWalletId) { + dataStore.updateData { stored -> + val current = stored[userWalletId.stringValue] ?: return@updateData stored + stored + (userWalletId.stringValue to current.copy(isBESynchronized = true)) + } + } + + override suspend fun getUnsynchronizedBlobs(): List { + return getStoredBlobs().values + .filterNot { it.isBESynchronized } + .map { it.blob } + } + + override suspend fun deleteBlob(userWalletId: UserWalletId) { + dataStore.updateData { stored -> stored - userWalletId.stringValue } + } + + private suspend fun getStoredBlobs(): AddressBookBlobs = dataStore.data.first() +} \ No newline at end of file diff --git a/data/address-book/src/main/kotlin/com/tangem/data/addressbook/store/StoredAddressBookBlob.kt b/data/address-book/src/main/kotlin/com/tangem/data/addressbook/store/StoredAddressBookBlob.kt new file mode 100644 index 0000000000..9e82e17205 --- /dev/null +++ b/data/address-book/src/main/kotlin/com/tangem/data/addressbook/store/StoredAddressBookBlob.kt @@ -0,0 +1,15 @@ +package com.tangem.data.addressbook.store + +import com.tangem.domain.addressbook.model.AddressBookBlob +import kotlinx.serialization.Serializable + +/** + * [isBESynchronized] tracks whether the blob has already been pushed to the backend. A freshly + * stored blob is written optimistically with `false`; a future BE-sync service flips it to `true` + * once the push is confirmed. + */ +@Serializable +internal data class StoredAddressBookBlob( + val blob: AddressBookBlob, + val isBESynchronized: Boolean, +) \ No newline at end of file diff --git a/data/address-book/src/test/kotlin/com/tangem/data/addressbook/DefaultAddressBookRepositoryTest.kt b/data/address-book/src/test/kotlin/com/tangem/data/addressbook/DefaultAddressBookRepositoryTest.kt new file mode 100644 index 0000000000..233b709cfa --- /dev/null +++ b/data/address-book/src/test/kotlin/com/tangem/data/addressbook/DefaultAddressBookRepositoryTest.kt @@ -0,0 +1,221 @@ +package com.tangem.data.addressbook + +import arrow.core.left +import arrow.core.right +import com.google.common.truth.Truth.assertThat +import com.tangem.data.addressbook.store.AddressBookBlobStore +import com.tangem.domain.addressbook.crypto.AddressBookCipher +import com.tangem.domain.addressbook.error.AddressBookCryptoError +import com.tangem.domain.addressbook.model.AddressBook +import com.tangem.domain.addressbook.model.AddressBookBlob +import com.tangem.domain.addressbook.model.Contact +import com.tangem.domain.addressbook.model.ContactId +import com.tangem.domain.addressbook.model.ContactName +import com.tangem.domain.addressbook.time.IsoTimestampProvider +import com.tangem.domain.common.wallets.UserWalletsListRepository +import com.tangem.domain.models.wallet.UserWallet +import com.tangem.domain.models.wallet.UserWalletId +import com.tangem.utils.coroutines.TestingCoroutineDispatcherProvider +import io.mockk.clearMocks +import io.mockk.coEvery +import io.mockk.coVerify +import io.mockk.every +import io.mockk.mockk +import io.mockk.slot +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.flowOf +import kotlinx.coroutines.test.runTest +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.TestInstance + +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +internal class DefaultAddressBookRepositoryTest { + + private val blobStore: AddressBookBlobStore = mockk() + private val cipher: AddressBookCipher = mockk() + private val userWalletsListRepository: UserWalletsListRepository = mockk() + private val timestampProvider: IsoTimestampProvider = mockk() + + private val userWallet: UserWallet = mockk { + every { walletId } returns UserWalletId(WALLET_A) + } + + private val repository = DefaultAddressBookRepository( + blobStore = blobStore, + cipher = cipher, + userWalletsListRepository = userWalletsListRepository, + timestampProvider = timestampProvider, + dispatchers = TestingCoroutineDispatcherProvider(), + ) + + @BeforeEach + fun setup() { + clearMocks(blobStore, cipher, userWalletsListRepository, timestampProvider) + every { timestampProvider.now() } returns TIMESTAMP + coEvery { userWalletsListRepository.userWalletsSync() } returns listOf(userWallet) + } + + @Test + fun `GIVEN decryptable blob WHEN getContacts THEN emits decrypted contacts`() = runTest { + // Arrange + val contact = createContact(id = "c1", name = "Alice") + val blob = createBlob() + every { blobStore.getBlob(UserWalletId(WALLET_A)) } returns flowOf(blob) + every { cipher.decrypt(blob, userWallet) } returns AddressBook(UserWalletId(WALLET_A), listOf(contact)).right() + + // Act + val result = repository.getContacts(UserWalletId(WALLET_A)).first() + + // Assert + assertThat(result).containsExactly(contact) + } + + @Test + fun `GIVEN multiple wallets WHEN getAllContacts THEN emits contacts from all wallets`() = runTest { + // Arrange + val contact = createContact(id = "c1", name = "Alice") + val blob = createBlob() + every { userWalletsListRepository.userWallets } returns MutableStateFlow(listOf(userWallet)) + every { blobStore.getBlobs(setOf(UserWalletId(WALLET_A))) } returns flowOf(listOf(blob)) + every { cipher.decrypt(blob, userWallet) } returns AddressBook(UserWalletId(WALLET_A), listOf(contact)).right() + + // Act + val result = repository.getAllContacts().first() + + // Assert + assertThat(result).containsExactly(contact) + } + + @Test + fun `GIVEN no blob WHEN getContacts THEN emits empty`() = runTest { + // Arrange + every { blobStore.getBlob(UserWalletId(WALLET_A)) } returns flowOf(null) + + // Act + val result = repository.getContacts(UserWalletId(WALLET_A)).first() + + // Assert + assertThat(result).isEmpty() + } + + @Test + fun `GIVEN decryption fails WHEN getContacts THEN emits empty`() = runTest { + // Arrange + val blob = createBlob() + every { blobStore.getBlob(UserWalletId(WALLET_A)) } returns flowOf(blob) + every { cipher.decrypt(blob, userWallet) } returns AddressBookCryptoError.DecryptionFailed.left() + + // Act + val result = repository.getContacts(UserWalletId(WALLET_A)).first() + + // Assert + assertThat(result).isEmpty() + } + + @Test + fun `GIVEN new contact WHEN saveContact THEN encrypts merged book and stores blob`() = runTest { + // Arrange + val existing = createContact(id = "c1", name = "Alice") + val added = createContact(id = "c2", name = "Bob") + val storedBlob = createBlob() + coEvery { blobStore.getBlobSync(UserWalletId(WALLET_A)) } returns storedBlob + every { cipher.decrypt(storedBlob, userWallet) } returns + AddressBook(UserWalletId(WALLET_A), listOf(existing)).right() + val bookSlot = slot() + val newBlob = createBlob() + every { cipher.encrypt(capture(bookSlot), userWallet, any()) } returns newBlob.right() + coEvery { blobStore.storeBlob(newBlob) } returns Unit + + // Act + repository.saveContact(added) + + // Assert + assertThat(bookSlot.captured.contacts).containsExactly(existing, added) + coVerify(exactly = 1) { blobStore.storeBlob(newBlob) } + } + + @Test + fun `GIVEN existing contact id WHEN saveContact THEN replaces it`() = runTest { + // Arrange + val original = createContact(id = "c1", name = "Alice") + val updated = createContact(id = "c1", name = "Alice Updated") + val storedBlob = createBlob() + coEvery { blobStore.getBlobSync(UserWalletId(WALLET_A)) } returns storedBlob + every { cipher.decrypt(storedBlob, userWallet) } returns + AddressBook(UserWalletId(WALLET_A), listOf(original)).right() + val bookSlot = slot() + every { cipher.encrypt(capture(bookSlot), userWallet, any()) } returns createBlob().right() + coEvery { blobStore.storeBlob(any()) } returns Unit + + // Act + repository.saveContact(updated) + + // Assert + assertThat(bookSlot.captured.contacts).containsExactly(updated) + } + + @Test + fun `GIVEN contact in wallet WHEN deleteContact THEN re-stores book without it`() = runTest { + // Arrange + val kept = createContact(id = "c1", name = "Alice") + val removed = createContact(id = "c2", name = "Bob") + val storedBlob = createBlob() + coEvery { blobStore.getBlobSync(UserWalletId(WALLET_A)) } returns storedBlob + every { cipher.decrypt(storedBlob, userWallet) } returns + AddressBook(UserWalletId(WALLET_A), listOf(kept, removed)).right() + val bookSlot = slot() + val newBlob = createBlob() + every { cipher.encrypt(capture(bookSlot), userWallet, any()) } returns newBlob.right() + coEvery { blobStore.storeBlob(newBlob) } returns Unit + + // Act + repository.deleteContact(ContactId("c2")) + + // Assert + assertThat(bookSlot.captured.contacts).containsExactly(kept) + coVerify(exactly = 1) { blobStore.storeBlob(newBlob) } + } + + @Test + fun `GIVEN matching name WHEN getContact THEN returns it`() = runTest { + // Arrange + val alice = createContact(id = "c1", name = "Alice") + val bob = createContact(id = "c2", name = "Bob") + val blob = createBlob() + coEvery { blobStore.getBlobSync(UserWalletId(WALLET_A)) } returns blob + every { cipher.decrypt(blob, userWallet) } returns + AddressBook(UserWalletId(WALLET_A), listOf(alice, bob)).right() + + // Act + val result = repository.getContact(UserWalletId(WALLET_A), name = "Bob") + + // Assert + assertThat(result).isEqualTo(bob) + } + + private fun createContact(id: String, name: String, iconColor: String = "KekColor"): Contact = Contact( + id = ContactId(id), + walletId = UserWalletId(WALLET_A), + name = ContactName(name).getOrNull()!!, + icon = "", + iconColor = iconColor, + createdAt = TIMESTAMP, + updatedAt = TIMESTAMP, + addressEntries = emptyList(), + ) + + private fun createBlob(): AddressBookBlob = AddressBookBlob( + walletId = WALLET_A, + updatedAt = TIMESTAMP, + nonce = "00112233445566778899aabb", + ciphertext = "deadbeef", + authTag = "cafebabecafebabecafebabecafebabe", + ) + + private companion object { + const val WALLET_A = "0a0a0a" + const val TIMESTAMP = "2026-05-22T09:00:00.000Z" + } +} \ No newline at end of file diff --git a/data/address-book/src/test/kotlin/com/tangem/data/addressbook/store/DefaultAddressBookBlobStoreTest.kt b/data/address-book/src/test/kotlin/com/tangem/data/addressbook/store/DefaultAddressBookBlobStoreTest.kt new file mode 100644 index 0000000000..14f271eaa2 --- /dev/null +++ b/data/address-book/src/test/kotlin/com/tangem/data/addressbook/store/DefaultAddressBookBlobStoreTest.kt @@ -0,0 +1,112 @@ +package com.tangem.data.addressbook.store + +import com.google.common.truth.Truth.assertThat +import com.tangem.domain.addressbook.model.AddressBookBlob +import com.tangem.domain.models.wallet.UserWalletId +import com.tangem.test.core.datastore.MockStateDataStore +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.test.runTest +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.TestInstance + +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +internal class DefaultAddressBookBlobStoreTest { + + private lateinit var store: DefaultAddressBookBlobStore + + @BeforeEach + fun setup() { + store = DefaultAddressBookBlobStore( + dataStore = MockStateDataStore(default = emptyMap()), + ) + } + + @Test + fun `GIVEN blob WHEN storeBlob THEN getBlob emits it AND it is unsynchronized`() = runTest { + // Arrange + val blob = createBlob(walletId = WALLET_A) + + // Act + store.storeBlob(blob) + + // Assert + assertThat(store.getBlob(UserWalletId(WALLET_A)).first()).isEqualTo(blob) + assertThat(store.getBlobSync(UserWalletId(WALLET_A))).isEqualTo(blob) + assertThat(store.getUnsynchronizedBlobs()).containsExactly(blob) + } + + @Test + fun `GIVEN stored blob WHEN markAsSynchronized THEN getUnsynchronizedBlobs excludes it`() = runTest { + // Arrange + val blob = createBlob(walletId = WALLET_A) + store.storeBlob(blob) + + // Act + store.markAsSynchronized(UserWalletId(WALLET_A)) + + // Assert + assertThat(store.getUnsynchronizedBlobs()).isEmpty() + assertThat(store.getBlob(UserWalletId(WALLET_A)).first()).isEqualTo(blob) + } + + @Test + fun `GIVEN blobs for two wallets WHEN getBlob walletA THEN only walletA blob emitted`() = runTest { + // Arrange + val blobA = createBlob(walletId = WALLET_A) + val blobB = createBlob(walletId = WALLET_B) + store.storeBlob(blobA) + store.storeBlob(blobB) + + // Act + val result = store.getBlob(UserWalletId(WALLET_A)).first() + + // Assert + assertThat(result).isEqualTo(blobA) + assertThat(store.getUnsynchronizedBlobs()).containsExactly(blobA, blobB) + } + + @Test + fun `GIVEN blobs for two wallets WHEN getBlobs THEN only requested wallets returned`() = runTest { + // Arrange + val blobA = createBlob(walletId = WALLET_A) + val blobB = createBlob(walletId = WALLET_B) + store.storeBlob(blobA) + store.storeBlob(blobB) + + // Act + val result = store.getBlobs(setOf(UserWalletId(WALLET_A), UserWalletId(WALLET_B))).first() + val onlyA = store.getBlobs(setOf(UserWalletId(WALLET_A))).first() + + // Assert + assertThat(result).containsExactly(blobA, blobB) + assertThat(onlyA).containsExactly(blobA) + } + + @Test + fun `GIVEN stored blob WHEN deleteBlob THEN getBlob emits null`() = runTest { + // Arrange + val blob = createBlob(walletId = WALLET_A) + store.storeBlob(blob) + + // Act + store.deleteBlob(UserWalletId(WALLET_A)) + + // Assert + assertThat(store.getBlob(UserWalletId(WALLET_A)).first()).isNull() + assertThat(store.getBlobSync(UserWalletId(WALLET_A))).isNull() + } + + private fun createBlob(walletId: String): AddressBookBlob = AddressBookBlob( + walletId = walletId, + updatedAt = "2026-05-22T09:00:00.000Z", + nonce = "00112233445566778899aabb", + ciphertext = "deadbeef", + authTag = "cafebabecafebabecafebabecafebabe", + ) + + private companion object { + const val WALLET_A = "0a0a0a" + const val WALLET_B = "0b0b0b" + } +} \ No newline at end of file diff --git a/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampRepository.kt b/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampRepository.kt index e783308ca6..6d69d7ab7b 100644 --- a/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampRepository.kt +++ b/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampRepository.kt @@ -115,7 +115,7 @@ internal class DefaultOnrampRepository( override suspend fun fetchCountries(userWallet: UserWallet): List = withContext(dispatchers.io) { if (!countriesStore.getSyncOrNull(COUNTRIES_KEY).isNullOrEmpty()) return@withContext emptyList() - val result = onrampApi.getCountries( + val response = onrampApi.getCountries( userWalletId = userWallet.walletId.stringValue, refCode = ExpressUtils.getRefCode( userWallet = userWallet, @@ -123,8 +123,12 @@ internal class DefaultOnrampRepository( ), ) .getOrThrow() - .map(countryConverter::convert) + if (txHistoryFeatureToggles.isNewTxHistoryEnabled) { + expressHistoryDao.upsertCountries(response.map { it.toEntity() }) + } + + val result = response.map(countryConverter::convert) countriesStore.store(COUNTRIES_KEY, result) result diff --git a/data/push-notification-preferences/src/main/kotlin/com/tangem/data/pushnotificationpreferences/DefaultWalletPushNotificationPreferencesRepository.kt b/data/push-notification-preferences/src/main/kotlin/com/tangem/data/pushnotificationpreferences/DefaultWalletPushNotificationPreferencesRepository.kt index c5b207e92b..7f8be9280c 100644 --- a/data/push-notification-preferences/src/main/kotlin/com/tangem/data/pushnotificationpreferences/DefaultWalletPushNotificationPreferencesRepository.kt +++ b/data/push-notification-preferences/src/main/kotlin/com/tangem/data/pushnotificationpreferences/DefaultWalletPushNotificationPreferencesRepository.kt @@ -1,54 +1,49 @@ package com.tangem.data.pushnotificationpreferences import arrow.core.Either +import com.tangem.data.pushnotificationpreferences.converters.PushNotificationPreferencesConverter +import com.tangem.datasource.api.common.response.getOrThrow import com.tangem.datasource.api.tangemTech.TangemTechApi +import com.tangem.datasource.api.tangemTech.models.PushNotificationPreferencesBody import com.tangem.datasource.local.datastore.RuntimeSharedStore -import com.tangem.datasource.local.preferences.AppPreferencesStore -import com.tangem.datasource.local.preferences.PreferencesKeys -import com.tangem.datasource.local.preferences.utils.getObjectMapSync import com.tangem.domain.models.wallet.UserWalletId import com.tangem.domain.pushnotificationpreferences.models.PushNotificationCategory -import com.tangem.domain.pushnotificationpreferences.models.PushNotificationPreference import com.tangem.domain.pushnotificationpreferences.models.WalletPushNotificationPreferences import com.tangem.domain.pushnotificationpreferences.repository.WalletPushNotificationPreferencesRepository import com.tangem.utils.coroutines.CoroutineDispatcherProvider +import java.util.concurrent.ConcurrentHashMap import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onStart +import kotlinx.coroutines.sync.Mutex +import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.withContext /** - * In-memory cache implementation of [WalletPushNotificationPreferencesRepository]. - * - * Mock-mode (current): defaults are computed locally and writes are kept in-memory only. - * Real-mode (when Variant C BE is ready): replace TODO blocks with [TangemTechApi] calls. - * - * Defaults for existing users (until BE migration runs): TX read from - * [PreferencesKeys.NOTIFICATIONS_ENABLED_STATES_KEY] (default true), Offers&Updates = true, Price Alerts = false, - * isVisible = true for all three. + * Preferences are cached in-memory (non-persistent); writes are full-replace PUTs and the server echo + * is cached as the source of truth. */ internal class DefaultWalletPushNotificationPreferencesRepository( - private val appPreferencesStore: AppPreferencesStore, - @Suppress("unused") private val tangemTechApi: TangemTechApi, + private val tangemTechApi: TangemTechApi, private val cache: RuntimeSharedStore>, private val dispatchers: CoroutineDispatcherProvider, ) : WalletPushNotificationPreferencesRepository { + private val walletMutexes = ConcurrentHashMap() + override suspend fun preload(userWalletId: UserWalletId) { - if (cache.getSyncOrNull()?.containsKey(userWalletId.stringValue) == true) return - val preferences = withContext(dispatchers.io) { - // TODO: uncomment when api is ready - // val response = tangemTechApi.getPushNotificationPreferences(userWalletId.stringValue).getOrThrow() - // PushNotificationPreferencesConverter.convert(response) - loadDefaults(userWalletId) - } - cache.update(default = emptyMap()) { current -> - if (current.containsKey(userWalletId.stringValue)) { - current - } else { - current + (userWalletId.stringValue to preferences) + if (isCached(userWalletId)) return + mutexFor(userWalletId).withLock { + if (isCached(userWalletId)) return + val preferences = fetch(userWalletId) + cache.update(default = emptyMap()) { current -> + if (current.containsKey(userWalletId.stringValue)) { + current + } else { + current + (userWalletId.stringValue to preferences) + } } } } @@ -64,9 +59,11 @@ internal class DefaultWalletPushNotificationPreferencesRepository( category: PushNotificationCategory, isEnabled: Boolean, ): Either = Either.catch { - val current = cache.getSyncOrNull()?.get(userWalletId.stringValue) ?: loadDefaults(userWalletId) - val updated = current.withCategory(category, isEnabled) - putAndCommit(userWalletId, updated) + mutexFor(userWalletId).withLock { + val current = currentOrFetch(userWalletId) + val updated = current.withCategory(category, isEnabled) + putAndCommit(userWalletId, updated) + } } override suspend fun setAllPreferences( @@ -75,39 +72,45 @@ internal class DefaultWalletPushNotificationPreferencesRepository( offersUpdates: Boolean, priceAlerts: Boolean, ): Either = Either.catch { - val current = cache.getSyncOrNull()?.get(userWalletId.stringValue) ?: loadDefaults(userWalletId) - val updated = current.copy( - transactionAlerts = current.transactionAlerts.copy(isEnabled = transactionAlerts), - offersUpdates = current.offersUpdates.copy(isEnabled = offersUpdates), - priceAlerts = current.priceAlerts.copy(isEnabled = priceAlerts), - ) - putAndCommit(userWalletId, updated) + mutexFor(userWalletId).withLock { + val current = currentOrFetch(userWalletId) + val updated = current.copy( + transactionAlerts = current.transactionAlerts.copy(isEnabled = transactionAlerts), + offersUpdates = current.offersUpdates.copy(isEnabled = offersUpdates), + priceAlerts = current.priceAlerts.copy(isEnabled = priceAlerts), + ) + putAndCommit(userWalletId, updated) + } } + // Cache, or a freshly fetched server snapshot, so a full-replace PUT never carries fabricated defaults. + private suspend fun currentOrFetch(userWalletId: UserWalletId): WalletPushNotificationPreferences = + cache.getSyncOrNull()?.get(userWalletId.stringValue) ?: fetch(userWalletId) + + private suspend fun fetch(userWalletId: UserWalletId): WalletPushNotificationPreferences = + withContext(dispatchers.io) { + val response = tangemTechApi.getPushNotificationPreferences(userWalletId.stringValue).getOrThrow() + PushNotificationPreferencesConverter.convert(response) + } + + private suspend fun isCached(userWalletId: UserWalletId): Boolean = + cache.getSyncOrNull()?.containsKey(userWalletId.stringValue) == true + + private fun mutexFor(userWalletId: UserWalletId): Mutex = + walletMutexes.computeIfAbsent(userWalletId.stringValue) { Mutex() } + private suspend fun putAndCommit(userWalletId: UserWalletId, updated: WalletPushNotificationPreferences) { - withContext(dispatchers.io) { - // TODO: uncomment when api is ready - // tangemTechApi.updatePushNotificationPreferences( - // walletId = userWalletId.stringValue, - // body = PushNotificationPreferencesBody( - // areTransactionAlertsEnabled = updated.transactionAlerts.isEnabled, - // areOffersUpdatesEnabled = updated.offersUpdates.isEnabled, - // arePriceAlertsEnabled = updated.priceAlerts.isEnabled, - // ), - // ).getOrThrow() + val applied = withContext(dispatchers.io) { + val response = tangemTechApi.updatePushNotificationPreferences( + walletId = userWalletId.stringValue, + body = PushNotificationPreferencesBody( + areTransactionEventsEnabled = updated.transactionAlerts.isEnabled, + areOfferUpdatesEnabled = updated.offersUpdates.isEnabled, + arePriceAlertsEnabled = updated.priceAlerts.isEnabled, + ), + ).getOrThrow() + PushNotificationPreferencesConverter.convert(response) } - cache.update(default = emptyMap()) { it + (userWalletId.stringValue to updated) } - } - - // TODO remove when api is ready, use api methods to load real settings - private suspend fun loadDefaults(userWalletId: UserWalletId): WalletPushNotificationPreferences { - val areTransactionAlertsEnabled = appPreferencesStore - .getObjectMapSync(PreferencesKeys.NOTIFICATIONS_ENABLED_STATES_KEY)[userWalletId.stringValue] != - false - return WalletPushNotificationPreferences( - transactionAlerts = PushNotificationPreference(isEnabled = areTransactionAlertsEnabled, isVisible = true), - offersUpdates = PushNotificationPreference(isEnabled = true, isVisible = true), - priceAlerts = PushNotificationPreference(isEnabled = false, isVisible = true), - ) + cache.update(default = emptyMap()) { it + (userWalletId.stringValue to applied) } } } \ No newline at end of file diff --git a/data/push-notification-preferences/src/main/kotlin/com/tangem/data/pushnotificationpreferences/converters/PushNotificationPreferencesConverter.kt b/data/push-notification-preferences/src/main/kotlin/com/tangem/data/pushnotificationpreferences/converters/PushNotificationPreferencesConverter.kt index 34a5e99cd3..5c2bfea3db 100644 --- a/data/push-notification-preferences/src/main/kotlin/com/tangem/data/pushnotificationpreferences/converters/PushNotificationPreferencesConverter.kt +++ b/data/push-notification-preferences/src/main/kotlin/com/tangem/data/pushnotificationpreferences/converters/PushNotificationPreferencesConverter.kt @@ -1,6 +1,5 @@ package com.tangem.data.pushnotificationpreferences.converters -import com.tangem.datasource.api.tangemTech.models.PushNotificationPreferenceState import com.tangem.datasource.api.tangemTech.models.PushNotificationPreferencesResponse import com.tangem.domain.pushnotificationpreferences.models.PushNotificationPreference import com.tangem.domain.pushnotificationpreferences.models.WalletPushNotificationPreferences @@ -11,11 +10,8 @@ internal object PushNotificationPreferencesConverter : override fun convert(value: PushNotificationPreferencesResponse): WalletPushNotificationPreferences = WalletPushNotificationPreferences( - transactionAlerts = value.transactionAlerts.toDomain(), - offersUpdates = value.offersUpdates.toDomain(), - priceAlerts = value.priceAlerts.toDomain(), + transactionAlerts = PushNotificationPreference(isEnabled = value.areTransactionEventsEnabled), + offersUpdates = PushNotificationPreference(isEnabled = value.areOfferUpdatesEnabled), + priceAlerts = PushNotificationPreference(isEnabled = value.arePriceAlertsEnabled), ) - - private fun PushNotificationPreferenceState.toDomain(): PushNotificationPreference = - PushNotificationPreference(isEnabled = isEnabled, isVisible = isVisible) } \ No newline at end of file diff --git a/data/push-notification-preferences/src/main/kotlin/com/tangem/data/pushnotificationpreferences/di/PushNotificationPreferencesModule.kt b/data/push-notification-preferences/src/main/kotlin/com/tangem/data/pushnotificationpreferences/di/PushNotificationPreferencesModule.kt index b82e635254..bcdafa677d 100644 --- a/data/push-notification-preferences/src/main/kotlin/com/tangem/data/pushnotificationpreferences/di/PushNotificationPreferencesModule.kt +++ b/data/push-notification-preferences/src/main/kotlin/com/tangem/data/pushnotificationpreferences/di/PushNotificationPreferencesModule.kt @@ -3,7 +3,6 @@ package com.tangem.data.pushnotificationpreferences.di import com.tangem.data.pushnotificationpreferences.DefaultWalletPushNotificationPreferencesRepository import com.tangem.datasource.api.tangemTech.TangemTechApi import com.tangem.datasource.local.datastore.RuntimeSharedStore -import com.tangem.datasource.local.preferences.AppPreferencesStore import com.tangem.domain.pushnotificationpreferences.repository.WalletPushNotificationPreferencesRepository import com.tangem.utils.coroutines.CoroutineDispatcherProvider import dagger.Module @@ -19,11 +18,9 @@ internal object PushNotificationPreferencesModule { @Singleton @Provides fun providesWalletPushNotificationPreferencesRepository( - appPreferencesStore: AppPreferencesStore, tangemTechApi: TangemTechApi, dispatchers: CoroutineDispatcherProvider, ): WalletPushNotificationPreferencesRepository = DefaultWalletPushNotificationPreferencesRepository( - appPreferencesStore = appPreferencesStore, tangemTechApi = tangemTechApi, cache = RuntimeSharedStore(), dispatchers = dispatchers, diff --git a/data/push-notification-preferences/src/test/kotlin/com/tangem/data/pushnotificationpreferences/DefaultWalletPushNotificationPreferencesRepositoryTest.kt b/data/push-notification-preferences/src/test/kotlin/com/tangem/data/pushnotificationpreferences/DefaultWalletPushNotificationPreferencesRepositoryTest.kt index c9334a143a..20ec904473 100644 --- a/data/push-notification-preferences/src/test/kotlin/com/tangem/data/pushnotificationpreferences/DefaultWalletPushNotificationPreferencesRepositoryTest.kt +++ b/data/push-notification-preferences/src/test/kotlin/com/tangem/data/pushnotificationpreferences/DefaultWalletPushNotificationPreferencesRepositoryTest.kt @@ -1,141 +1,220 @@ package com.tangem.data.pushnotificationpreferences -import androidx.datastore.core.DataStore -import androidx.datastore.preferences.core.Preferences -import androidx.datastore.preferences.core.emptyPreferences import app.cash.turbine.test import arrow.core.Either import com.google.common.truth.Truth.assertThat -import com.squareup.moshi.Moshi +import com.tangem.datasource.api.common.response.ApiResponse import com.tangem.datasource.api.tangemTech.TangemTechApi +import com.tangem.datasource.api.tangemTech.models.PushNotificationPreferencesBody +import com.tangem.datasource.api.tangemTech.models.PushNotificationPreferencesResponse import com.tangem.datasource.local.datastore.RuntimeSharedStore -import com.tangem.datasource.local.preferences.AppPreferencesStore import com.tangem.domain.models.wallet.UserWalletId import com.tangem.domain.pushnotificationpreferences.models.PushNotificationCategory import com.tangem.domain.pushnotificationpreferences.models.PushNotificationPreference import com.tangem.domain.pushnotificationpreferences.models.WalletPushNotificationPreferences import com.tangem.utils.coroutines.TestingCoroutineDispatcherProvider import io.mockk.coEvery +import io.mockk.coVerify import io.mockk.mockk -import kotlinx.coroutines.flow.flowOf +import kotlinx.coroutines.CompletableDeferred +import kotlinx.coroutines.launch +import kotlinx.coroutines.test.advanceUntilIdle +import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest import org.junit.jupiter.api.Test class DefaultWalletPushNotificationPreferencesRepositoryTest { private val tangemTechApi: TangemTechApi = mockk() - private val preferencesDataStore: DataStore = mockk() - private val appPreferencesStore = AppPreferencesStore( - moshi = Moshi.Builder().build(), - dispatchers = TestingCoroutineDispatcherProvider(), - preferencesDataStore = preferencesDataStore, - ) private val userWalletId = UserWalletId(stringValue = "0011223344556677") private val otherWalletId = UserWalletId(stringValue = "ffeeddccbbaa9988") private val repository = DefaultWalletPushNotificationPreferencesRepository( - appPreferencesStore = appPreferencesStore, tangemTechApi = tangemTechApi, cache = RuntimeSharedStore(), dispatchers = TestingCoroutineDispatcherProvider(), ) @Test - fun `GIVEN no prior state WHEN preload THEN cache contains defaults`() = runTest { - coEvery { preferencesDataStore.data } returns flowOf(emptyPreferences()) + fun `GIVEN server returns prefs WHEN preload THEN cache holds converted server state`() = runTest { + // Arrange + stubGet(userWalletId, transaction = true, offers = true, price = false) + // Act repository.preload(userWalletId) + // Assert repository.observePreferences(userWalletId).test { - assertThat(awaitItem()).isEqualTo(defaults(transactionAlertsEnabled = true)) + assertThat(awaitItem()).isEqualTo(prefs(transaction = true, offers = true, price = false)) } + coVerify(exactly = 1) { tangemTechApi.getPushNotificationPreferences(userWalletId.stringValue) } } @Test - fun `GIVEN preload already done WHEN preload called again THEN no-op`() = runTest { - coEvery { preferencesDataStore.data } returns flowOf(emptyPreferences()) + fun `GIVEN already preloaded WHEN preload called again THEN no second GET`() = runTest { + // Arrange + stubGet(userWalletId, transaction = true, offers = true, price = false) + // Act + repository.preload(userWalletId) + repository.preload(userWalletId) + + // Assert + coVerify(exactly = 1) { tangemTechApi.getPushNotificationPreferences(userWalletId.stringValue) } + } + + @Test + fun `GIVEN cache miss WHEN updatePreference THEN fetches baseline AND sends full-replace PUT AND caches echo`() = + runTest { + // Arrange + stubGet(userWalletId, transaction = true, offers = true, price = false) + stubPut(userWalletId, transaction = true, offers = true, price = true) + + // Act + val result = repository.updatePreference( + userWalletId = userWalletId, + category = PushNotificationCategory.PriceAlerts, + isEnabled = true, + ) + + // Assert + assertThat(result).isInstanceOf(Either.Right::class.java) + // The full-replace body changes only the tapped category on top of the server baseline. + coVerify(exactly = 1) { + tangemTechApi.updatePushNotificationPreferences( + userWalletId.stringValue, + PushNotificationPreferencesBody( + areTransactionEventsEnabled = true, + areOfferUpdatesEnabled = true, + arePriceAlertsEnabled = true, + ), + ) + } + repository.observePreferences(userWalletId).test { + assertThat(awaitItem()).isEqualTo(prefs(transaction = true, offers = true, price = true)) + } + } + + @Test + fun `GIVEN preloaded state WHEN updatePreference THEN only the tapped category changes in the PUT body`() = runTest { + // Arrange + stubGet(userWalletId, transaction = true, offers = true, price = false) + stubPut(userWalletId, transaction = true, offers = false, price = false) + + // Act repository.preload(userWalletId) repository.updatePreference(userWalletId, PushNotificationCategory.OffersUpdates, isEnabled = false) + + // Assert + coVerify(exactly = 1) { + tangemTechApi.updatePushNotificationPreferences( + userWalletId.stringValue, + PushNotificationPreferencesBody( + areTransactionEventsEnabled = true, + areOfferUpdatesEnabled = false, + arePriceAlertsEnabled = false, + ), + ) + } + } + + @Test + fun `GIVEN write fails WHEN updatePreference THEN returns Left`() = runTest { + // Arrange + stubGet(userWalletId, transaction = true, offers = true, price = false) + repository.preload(userWalletId) + coEvery { tangemTechApi.updatePushNotificationPreferences(any(), any()) } throws IllegalStateException("boom") + + // Act + val result = repository.updatePreference(userWalletId, PushNotificationCategory.OffersUpdates, isEnabled = false) + + // Assert + assertThat(result).isInstanceOf(Either.Left::class.java) + } + + @Test + fun `GIVEN different wallets WHEN observed THEN each keeps its own server state`() = runTest { + // Arrange + stubGet(userWalletId, transaction = false, offers = false, price = false) + stubGet(otherWalletId, transaction = true, offers = true, price = true) + + // Assert + repository.observePreferences(userWalletId).test { + assertThat(awaitItem()).isEqualTo(prefs(transaction = false, offers = false, price = false)) + } + repository.observePreferences(otherWalletId).test { + assertThat(awaitItem()).isEqualTo(prefs(transaction = true, offers = true, price = true)) + } + } + + @Test + fun `GIVEN concurrent collectors WHEN preload races THEN a single GET is issued`() = runTest { + // Arrange + val gate = CompletableDeferred() + coEvery { tangemTechApi.getPushNotificationPreferences(userWalletId.stringValue) } coAnswers { + gate.await() + ApiResponse.Success(PushNotificationPreferencesResponse(true, true, false)) + } + + // Act + launch { repository.preload(userWalletId) } + runCurrent() + launch { repository.preload(userWalletId) } + runCurrent() + gate.complete(Unit) + advanceUntilIdle() + + // Assert + coVerify(exactly = 1) { tangemTechApi.getPushNotificationPreferences(userWalletId.stringValue) } + } + + @Test + fun `GIVEN concurrent writes WHEN updatePreference races THEN serialized so no update is lost`() = runTest { + // Arrange + stubGet(userWalletId, transaction = true, offers = true, price = false) + val gate = CompletableDeferred() + coEvery { tangemTechApi.updatePushNotificationPreferences(eq(userWalletId.stringValue), any()) } coAnswers { + val body = arg(1) + gate.await() + ApiResponse.Success( + PushNotificationPreferencesResponse( + body.areTransactionEventsEnabled, + body.areOfferUpdatesEnabled, + body.arePriceAlertsEnabled, + ), + ) + } repository.preload(userWalletId) + // Act + launch { repository.updatePreference(userWalletId, PushNotificationCategory.OffersUpdates, isEnabled = false) } + runCurrent() + launch { repository.updatePreference(userWalletId, PushNotificationCategory.PriceAlerts, isEnabled = true) } + runCurrent() + gate.complete(Unit) + advanceUntilIdle() + + // Assert + coVerify(exactly = 2) { tangemTechApi.updatePushNotificationPreferences(eq(userWalletId.stringValue), any()) } repository.observePreferences(userWalletId).test { - val item = awaitItem() - assertThat(item.offersUpdates.isEnabled).isFalse() + assertThat(awaitItem()).isEqualTo(prefs(transaction = true, offers = false, price = true)) } } - @Test - fun `GIVEN cache miss WHEN updatePreference THEN loads defaults and applies update`() = runTest { - coEvery { preferencesDataStore.data } returns flowOf(emptyPreferences()) - - val result = repository.updatePreference( - userWalletId = userWalletId, - category = PushNotificationCategory.PriceAlerts, - isEnabled = true, - ) - - assertThat(result).isInstanceOf(Either.Right::class.java) - repository.observePreferences(userWalletId).test { - val item = awaitItem() - assertThat(item.priceAlerts.isEnabled).isTrue() - assertThat(item.offersUpdates.isEnabled).isTrue() - assertThat(item.transactionAlerts.isEnabled).isTrue() - } + private fun stubGet(id: UserWalletId, transaction: Boolean, offers: Boolean, price: Boolean) { + coEvery { tangemTechApi.getPushNotificationPreferences(id.stringValue) } returns + ApiResponse.Success(PushNotificationPreferencesResponse(transaction, offers, price)) } - @Test - fun `GIVEN preloaded state WHEN updatePreference for each category THEN updates only that category`() = runTest { - coEvery { preferencesDataStore.data } returns flowOf(emptyPreferences()) - - repository.preload(userWalletId) - repository.updatePreference(userWalletId, PushNotificationCategory.TransactionAlerts, isEnabled = false) - repository.updatePreference(userWalletId, PushNotificationCategory.OffersUpdates, isEnabled = false) - repository.updatePreference(userWalletId, PushNotificationCategory.PriceAlerts, isEnabled = true) - - repository.observePreferences(userWalletId).test { - val item = awaitItem() - assertThat(item.transactionAlerts.isEnabled).isFalse() - assertThat(item.offersUpdates.isEnabled).isFalse() - assertThat(item.priceAlerts.isEnabled).isTrue() - } + private fun stubPut(id: UserWalletId, transaction: Boolean, offers: Boolean, price: Boolean) { + coEvery { tangemTechApi.updatePushNotificationPreferences(eq(id.stringValue), any()) } returns + ApiResponse.Success(PushNotificationPreferencesResponse(transaction, offers, price)) } - @Test - fun `GIVEN no subscription yet WHEN observePreferences subscribed THEN triggers preload and emits defaults`() = - runTest { - coEvery { preferencesDataStore.data } returns flowOf(emptyPreferences()) - - repository.observePreferences(userWalletId).test { - val item = awaitItem() - assertThat(item).isEqualTo(defaults(transactionAlertsEnabled = true)) - } - } - - @Test - fun `GIVEN updates for different wallets WHEN observed independently THEN each wallet has its own state`() = - runTest { - coEvery { preferencesDataStore.data } returns flowOf(emptyPreferences()) - - repository.updatePreference(userWalletId, PushNotificationCategory.OffersUpdates, isEnabled = false) - repository.updatePreference(otherWalletId, PushNotificationCategory.PriceAlerts, isEnabled = true) - - repository.observePreferences(userWalletId).test { - val item = awaitItem() - assertThat(item.offersUpdates.isEnabled).isFalse() - assertThat(item.priceAlerts.isEnabled).isFalse() - } - repository.observePreferences(otherWalletId).test { - val item = awaitItem() - assertThat(item.offersUpdates.isEnabled).isTrue() - assertThat(item.priceAlerts.isEnabled).isTrue() - } - } - - private fun defaults(transactionAlertsEnabled: Boolean) = WalletPushNotificationPreferences( - transactionAlerts = PushNotificationPreference(isEnabled = transactionAlertsEnabled, isVisible = true), - offersUpdates = PushNotificationPreference(isEnabled = true, isVisible = true), - priceAlerts = PushNotificationPreference(isEnabled = false, isVisible = true), + private fun prefs(transaction: Boolean, offers: Boolean, price: Boolean) = WalletPushNotificationPreferences( + transactionAlerts = PushNotificationPreference(isEnabled = transaction), + offersUpdates = PushNotificationPreference(isEnabled = offers), + priceAlerts = PushNotificationPreference(isEnabled = price), ) } \ No newline at end of file diff --git a/data/txhistory/build.gradle.kts b/data/txhistory/build.gradle.kts index 0320d9912c..54c7e3792f 100644 --- a/data/txhistory/build.gradle.kts +++ b/data/txhistory/build.gradle.kts @@ -31,6 +31,8 @@ dependencies { implementation(projects.domain.express.models) implementation(projects.domain.wallets.models) implementation(projects.domain.wallets) + implementation(projects.domain.onramp) + implementation(projects.domain.onramp.models) implementation(projects.domain.account) implementation(projects.domain.account.status) diff --git a/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/fetcher/DefaultAppTxHistoryFetcher.kt b/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/fetcher/DefaultAppTxHistoryFetcher.kt index c4e4e208a3..3141aa5a00 100644 --- a/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/fetcher/DefaultAppTxHistoryFetcher.kt +++ b/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/fetcher/DefaultAppTxHistoryFetcher.kt @@ -9,6 +9,7 @@ import com.tangem.domain.express.ExpressRepository import com.tangem.domain.models.wallet.UserWallet import com.tangem.domain.models.wallet.UserWalletId import com.tangem.domain.models.wallet.isMultiCurrency +import com.tangem.domain.onramp.repositories.OnrampRepository import com.tangem.domain.txhistory.fetcher.AppTxHistoryFetcher import com.tangem.domain.txhistory.fetcher.TxHistoryFetchTrigger import com.tangem.domain.txhistory.fetcher.WalletTxHistoryFetcher @@ -22,6 +23,7 @@ import javax.inject.Inject internal class DefaultAppTxHistoryFetcher @Inject constructor( private val utils: TxHistoryFetcherUtils, private val expressRepository: ExpressRepository, + private val onrampRepository: OnrampRepository, private val getWalletsUseCase: GetWalletsUseCase, private val selectedWalletUseCase: GetSelectedWalletUseCase, private val walletTxHistoryFetcherFactory: DefaultWalletTxHistoryFetcher.Factory, @@ -30,9 +32,6 @@ internal class DefaultAppTxHistoryFetcher @Inject constructor( @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) internal val fetchers = ConcurrentHashMap() - /** Wallets whose express providers were already loaded — to load them at most once per wallet. */ - private val providersLoadedWallets = mutableSetOf() - init { defaultLaunchIn(buildFlow()) } @@ -53,11 +52,14 @@ internal class DefaultAppTxHistoryFetcher @Inject constructor( .stateIn(this) walletsFlow.value.keys.createForNewWallets() + walletsFlow.value.values.firstOrNull()?.let { wallet -> + loadExpressProviders(wallet) + loadOnrampCountries(wallet) + } selectedWalletUseCase.selectedFlow() .filter { wallet -> wallet.isMultiCurrency } // todo txhistory some init trigger? - .onEach { wallet -> loadExpressProviders(wallet) } .launchIn(this) walletsFlow @@ -79,13 +81,17 @@ internal class DefaultAppTxHistoryFetcher @Inject constructor( } private fun ProducerScope<*>.loadExpressProviders(wallet: UserWallet) { - // Load once per wallet: `add` returns false if this walletId was already loaded. - if (!providersLoadedWallets.add(wallet.walletId)) return flow { emit(expressRepository.getProviders(userWallet = wallet, filterProviderTypes = emptyList())) } .retryThreeTimes() .launchIn(this) } + private fun ProducerScope<*>.loadOnrampCountries(wallet: UserWallet) { + flow { emit(onrampRepository.fetchCountries(userWallet = wallet)) } + .retryThreeTimes() + .launchIn(this) + } + private fun Flow>.createForNewWallets() = onEach { ids -> ids.createForNewWallets() } private fun Set.createForNewWallets() = this.forEach { walletId -> getOrPutFetcher(walletId) } diff --git a/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/RefactoredTxHistoryRepository.kt b/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/RefactoredTxHistoryRepository.kt index 079d385fa7..4035351559 100644 --- a/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/RefactoredTxHistoryRepository.kt +++ b/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/RefactoredTxHistoryRepository.kt @@ -5,9 +5,16 @@ import com.tangem.data.common.converter.ExpressProviderConverter import com.tangem.data.txhistory.repository.converter.ExpressStatusMapper import com.tangem.data.txhistory.repository.converter.ExpressOnrampConverter import com.tangem.data.txhistory.repository.converter.ExpressSwapConverter +import com.tangem.data.txhistory.repository.converter.OnrampCountryConverter +import com.tangem.data.txhistory.repository.factory.ExpressTransactionAssetFactory +import com.tangem.data.txhistory.repository.factory.toAssetId import com.tangem.data.txhistory.repository.paging.TxHistoryPageBatchFetcher import com.tangem.datasource.local.txhistory.TxHistoryItemsStore import com.tangem.datasource.local.txhistory.db.dao.ExpressHistoryDao +import com.tangem.datasource.local.txhistory.db.entity.express.ExpressExchangeEntity +import com.tangem.datasource.local.txhistory.db.entity.express.ExpressOnrampEntity +import com.tangem.datasource.local.txhistory.db.entity.express.ExpressProviderEntity +import com.tangem.datasource.local.txhistory.db.entity.express.OnrampCountryEntity import com.tangem.domain.express.models.ExpressAsset import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.domain.models.network.TxInfo @@ -36,6 +43,7 @@ internal class RefactoredTxHistoryRepository @Inject constructor( private val walletManagersFacade: WalletManagersFacade, private val txHistoryItemsStore: TxHistoryItemsStore, private val expressHistoryDao: ExpressHistoryDao, + private val expressTransactionAssetFactory: ExpressTransactionAssetFactory, private val cacheRegistry: CacheRegistry, private val dispatchers: CoroutineDispatcherProvider, ) : TxHistoryRepositoryV2 { @@ -44,6 +52,7 @@ internal class RefactoredTxHistoryRepository @Inject constructor( private val expressProviderConverter = ExpressProviderConverter() private val swapConverter = ExpressSwapConverter() private val onrampConverter = ExpressOnrampConverter() + private val onrampCountryConverter = OnrampCountryConverter() private val TxHistoryListConfig.storeKey get() = TxHistoryItemsStore.Key(userWalletId, currency) override fun getExpressHistory( @@ -84,38 +93,80 @@ internal class RefactoredTxHistoryRepository @Inject constructor( activeStatuses = ExpressStatusMapper.activeOnrampStatuses, ).distinctUntilChanged(), flow4 = expressHistoryDao.getProvidersById().distinctUntilChanged(), - transform = { outgoingSwaps, incomingSwaps, onramps, providers -> - buildList { - fun String.expressProvider() = providers[this]?.let(expressProviderConverter::convert) - outgoingSwaps.forEach { entity -> - val input = ExpressSwapConverter.Input( - entity = entity, - provider = entity.providerId.expressProvider(), - isOutgoing = true, - ) - add(swapConverter.convert(input)) - } - incomingSwaps.forEach { entity -> - val input = ExpressSwapConverter.Input( - entity = entity, - provider = entity.providerId.expressProvider(), - isOutgoing = false, - ) - add(swapConverter.convert(input)) - } - onramps.forEach { entity -> - val input = ExpressOnrampConverter.Input(entity, entity.providerId.expressProvider()) - add(onrampConverter.convert(input)) - } - } - // An exchange row may satisfy both swap queries only in degenerate cases; - // keep the outgoing interpretation (added first). - .distinctBy { it.txId } + flow5 = expressHistoryDao.getCountriesByCode().distinctUntilChanged(), + transform = { outgoingSwaps, incomingSwaps, onramps, providers, countries -> + buildExpressHistory( + userWalletId = userWalletId, + sources = ExpressHistorySources( + outgoingSwaps = outgoingSwaps, + incomingSwaps = incomingSwaps, + onramps = onramps, + providers = providers, + countries = countries, + ), + ) }, ) emitAll(flow) }.flowOn(dispatchers.io) + /** The reactive express-history inputs gathered from the DB in a single [combine] tick. */ + private data class ExpressHistorySources( + val outgoingSwaps: List, + val incomingSwaps: List, + val onramps: List, + val providers: Map, + val countries: Map, + ) + + private suspend fun buildExpressHistory( + userWalletId: UserWalletId, + sources: ExpressHistorySources, + ): List { + val currencies = expressTransactionAssetFactory.create( + userWalletId = userWalletId, + outgoingSwaps = sources.outgoingSwaps, + incomingSwaps = sources.incomingSwaps, + onramps = sources.onramps, + ) + fun String.expressProvider() = sources.providers[this]?.let(expressProviderConverter::convert) + fun String.onrampCountry() = sources.countries[this]?.let(onrampCountryConverter::convert) + return buildList { + sources.outgoingSwaps.forEach { entity -> + val input = ExpressSwapConverter.Input( + entity = entity, + provider = entity.providerId.expressProvider(), + isOutgoing = true, + fromCurrency = currencies[entity.from.toAssetId()], + toCurrency = currencies[entity.to.toAssetId()], + ) + add(swapConverter.convert(input)) + } + sources.incomingSwaps.forEach { entity -> + val input = ExpressSwapConverter.Input( + entity = entity, + provider = entity.providerId.expressProvider(), + isOutgoing = false, + fromCurrency = currencies[entity.from.toAssetId()], + toCurrency = currencies[entity.to.toAssetId()], + ) + add(swapConverter.convert(input)) + } + sources.onramps.forEach { entity -> + val input = ExpressOnrampConverter.Input( + entity = entity, + provider = entity.providerId.expressProvider(), + toCurrency = currencies[entity.to.toAssetId()], + country = entity.countryCode.onrampCountry(), + ) + add(onrampConverter.convert(input)) + } + } + // An exchange row may satisfy both swap queries only in degenerate cases; + // keep the outgoing interpretation (added first). + .distinctBy { it.txId } + } + override fun getTxHistoryBatchFlow(batchSize: Int, context: TxHistoryListBatchingContext): TxHistoryListBatchFlow { return BatchListSource( fetchDispatcher = dispatchers.io, diff --git a/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/converter/ExpressTxHistoryConverter.kt b/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/converter/ExpressTxHistoryConverter.kt index ce51c41197..d911aa525b 100644 --- a/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/converter/ExpressTxHistoryConverter.kt +++ b/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/converter/ExpressTxHistoryConverter.kt @@ -9,6 +9,8 @@ import com.tangem.domain.express.models.ExpressOnrampStatus import com.tangem.domain.express.models.ExpressProvider import com.tangem.domain.express.models.ExpressTransactionAsset import com.tangem.domain.express.models.OnrampTransaction +import com.tangem.domain.models.currency.CryptoCurrency +import com.tangem.domain.onramp.model.OnrampCountry import com.tangem.domain.tokens.model.Amount import com.tangem.domain.tokens.model.AmountType import com.tangem.domain.txhistory.model.ExpressTx @@ -26,7 +28,7 @@ import java.math.BigDecimal internal class ExpressSwapConverter : Converter { override fun convert(value: Input): ExpressTx.Swap = ExpressTx.Swap( - tx = convertExchangeTransaction(value.entity, value.provider), + tx = convertExchangeTransaction(value), isOutgoing = value.isOutgoing, txInfo = null, ) @@ -35,6 +37,8 @@ internal class ExpressSwapConverter : Converter { + + override fun convert(value: OnrampCountryEntity): OnrampCountry { + return OnrampCountry( + id = "${value.alpha3}-${value.name}", + name = value.name, + code = value.code, + image = value.image, + alpha3 = value.alpha3, + continent = value.continent, + defaultCurrency = OnrampCurrency( + name = value.defaultCurrency.name, + code = value.defaultCurrency.code, + image = value.defaultCurrency.image, + precision = value.defaultCurrency.precision, + unit = value.defaultCurrency.unit, + ), + onrampAvailable = value.isOnrampAvailable, + ) + } +} \ No newline at end of file diff --git a/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/factory/ExpressTransactionAssetFactory.kt b/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/factory/ExpressTransactionAssetFactory.kt new file mode 100644 index 0000000000..2645b0c017 --- /dev/null +++ b/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/factory/ExpressTransactionAssetFactory.kt @@ -0,0 +1,95 @@ +package com.tangem.data.txhistory.repository.factory + +import com.tangem.blockchainsdk.utils.ExcludedBlockchains +import com.tangem.data.common.currency.CryptoCurrencyFactory +import com.tangem.datasource.local.txhistory.db.entity.express.ExpressExchangeEntity +import com.tangem.datasource.local.txhistory.db.entity.express.ExpressOnrampEntity +import com.tangem.domain.account.supplier.MultiAccountListSupplier +import com.tangem.domain.common.wallets.UserWalletsListRepository +import com.tangem.domain.express.models.ExpressAsset +import com.tangem.domain.models.currency.CryptoCurrency +import com.tangem.domain.models.wallet.UserWallet +import com.tangem.domain.models.wallet.UserWalletId +import kotlinx.coroutines.flow.first +import javax.inject.Inject + +/** + * Resolves a portfolio [CryptoCurrency] for every express asset (network id + contract address) referenced by a + * batch of exchange/onramp entities. + * + * Strategy: read every account of every wallet ONCE (via [MultiAccountListSupplier]) and match each express asset + * against the flattened portfolio currencies by network id + contract address. When nothing matches — notably + * tokens that are not present in any portfolio — a coin is built for the asset's network as a fallback (for now). + */ +internal class ExpressTransactionAssetFactory @Inject constructor( + private val multiAccountListSupplier: MultiAccountListSupplier, + private val userWalletsListRepository: UserWalletsListRepository, + excludedBlockchains: ExcludedBlockchains, +) { + + private val cryptoCurrencyFactory = CryptoCurrencyFactory(excludedBlockchains) + + /** + * Builds a `assetId -> resolved currency` map covering both legs of every swap and the to-leg of every onramp. + * Entries whose currency could not be resolved at all (no match and no fallback coin) are omitted. + */ + suspend fun create( + userWalletId: UserWalletId, + outgoingSwaps: List, + incomingSwaps: List, + onramps: List, + ): Map { + val assetIds = buildSet { + (outgoingSwaps + incomingSwaps).forEach { entity -> + add(entity.from.toAssetId()) + add(entity.to.toAssetId()) + } + onramps.forEach { entity -> add(entity.to.toAssetId()) } + } + if (assetIds.isEmpty()) return emptyMap() + + val portfolioCurrencies = multiAccountListSupplier.invoke() + .first() + .flatMap { accountList -> accountList.flattenCurrencies() } + + val userWallet = userWalletsListRepository.userWalletsSync() + .firstOrNull { it.walletId == userWalletId } + + return buildMap { + assetIds.forEach { id -> + val currency = portfolioCurrencies.findMatching(id) ?: createFallbackCoin(id, userWallet) + if (currency != null) put(id, currency) + } + } + } + + private fun List.findMatching(id: ExpressAsset.ID): CryptoCurrency? { + val isCoin = id.contractAddress == ExpressAsset.EMPTY_CONTRACT_ADDRESS_VALUE + return firstOrNull { currency -> + currency.network.rawId == id.networkId && + if (isCoin) { + currency is CryptoCurrency.Coin + } else { + currency is CryptoCurrency.Token && + currency.contractAddress.equals(id.contractAddress, ignoreCase = true) + } + } + } + + // TODO txHistory: tokens that are not in any portfolio cannot be resolved yet — fall back to a coin on the asset's + // network. + private fun createFallbackCoin(id: ExpressAsset.ID, userWallet: UserWallet?): CryptoCurrency.Coin? { + userWallet ?: return null + return cryptoCurrencyFactory.createCoin( + networkId = id.networkId, + extraDerivationPath = null, + userWallet = userWallet, + ) + } +} + +internal fun ExpressExchangeEntity.AssetEmbedded.toAssetId(): ExpressAsset.ID = + ExpressAsset.ID(networkId = network, contractAddress = contractAddress) + +internal fun ExpressOnrampEntity.AssetEmbedded.toAssetId(): ExpressAsset.ID = + ExpressAsset.ID(networkId = network, contractAddress = contractAddress) \ No newline at end of file diff --git a/data/txhistory/src/test/kotlin/com/tangem/data/txhistory/fetcher/DefaultAppTxHistoryFetcherTest.kt b/data/txhistory/src/test/kotlin/com/tangem/data/txhistory/fetcher/DefaultAppTxHistoryFetcherTest.kt index 886dbb1c83..45ce663c52 100644 --- a/data/txhistory/src/test/kotlin/com/tangem/data/txhistory/fetcher/DefaultAppTxHistoryFetcherTest.kt +++ b/data/txhistory/src/test/kotlin/com/tangem/data/txhistory/fetcher/DefaultAppTxHistoryFetcherTest.kt @@ -7,6 +7,7 @@ import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.domain.express.ExpressRepository import com.tangem.domain.models.wallet.UserWallet import com.tangem.domain.models.wallet.UserWalletId +import com.tangem.domain.onramp.repositories.OnrampRepository import com.tangem.domain.txhistory.fetcher.TxHistoryFetchTrigger import com.tangem.domain.wallets.usecase.GetSelectedWalletUseCase import com.tangem.domain.wallets.usecase.GetWalletsUseCase @@ -14,7 +15,6 @@ import io.mockk.* import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.emptyFlow -import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.job import kotlinx.coroutines.test.* import org.junit.jupiter.api.BeforeEach @@ -29,14 +29,16 @@ internal class DefaultAppTxHistoryFetcherTest { private val selectedWalletUseCase: GetSelectedWalletUseCase = mockk() private val walletFetcherFactory: DefaultWalletTxHistoryFetcher.Factory = mockk() private val expressRepository: ExpressRepository = mockk() + private val onrampRepository: OnrampRepository = mockk() private val currency: CryptoCurrency = MockCryptoCurrencyFactory().ethereum @BeforeEach fun setup() { - clearMocks(getWalletsUseCase, selectedWalletUseCase, walletFetcherFactory, expressRepository) + clearMocks(getWalletsUseCase, selectedWalletUseCase, walletFetcherFactory, expressRepository, onrampRepository) every { selectedWalletUseCase.selectedFlow() } returns emptyFlow() coEvery { expressRepository.getProviders(any(), any()) } returns emptyList() + coEvery { onrampRepository.fetchCountries(any()) } returns emptyList() } @Test @@ -147,15 +149,16 @@ internal class DefaultAppTxHistoryFetcherTest { } @Test - fun `loads express providers when selected wallet is multi-currency`() = runTest { + fun `loads express providers and onramp countries for the first wallet on init`() = runTest { // Arrange val utils = createUtils() - every { getWalletsUseCase.invokeAsMap(any(), any()) } returns MutableStateFlow(linkedMapOf()) val wallet = mockk(relaxed = true) { every { isMultiCurrency } returns true every { walletId } returns WALLET_ID_1 } - every { selectedWalletUseCase.selectedFlow() } returns flowOf(wallet) + every { getWalletsUseCase.invokeAsMap(any(), any()) } returns + MutableStateFlow(linkedMapOf(WALLET_ID_1 to wallet)) + every { walletFetcherFactory.create(WALLET_ID_1) } returns relaxedWalletFetcher() // Act createFetcher(utils) @@ -163,48 +166,40 @@ internal class DefaultAppTxHistoryFetcherTest { // Assert coVerify(exactly = 1) { expressRepository.getProviders(wallet, emptyList()) } + coVerify(exactly = 1) { onrampRepository.fetchCountries(wallet) } } @Test - fun `loads express providers only once per wallet`() = runTest { + fun `does not load express data when there are no wallets`() = runTest { // Arrange val utils = createUtils() every { getWalletsUseCase.invokeAsMap(any(), any()) } returns MutableStateFlow(linkedMapOf()) - val wallet = mockk(relaxed = true) { - every { isMultiCurrency } returns true - every { walletId } returns WALLET_ID_1 - } - // Same wallet selected several times. - every { selectedWalletUseCase.selectedFlow() } returns flowOf(wallet, wallet, wallet) // Act createFetcher(utils) advanceUntilIdle() // Assert - coVerify(exactly = 1) { expressRepository.getProviders(wallet, emptyList()) } + coVerify(inverse = true) { expressRepository.getProviders(any(), any()) } + coVerify(inverse = true) { onrampRepository.fetchCountries(any()) } } @Test fun `provider loading failure does not break the wallet pipeline`() = runTest { // Arrange val utils = createUtils() - val walletsFlow = MutableStateFlow(linkedMapOf()) - every { getWalletsUseCase.invokeAsMap(any(), any()) } returns walletsFlow val wallet = mockk(relaxed = true) { every { isMultiCurrency } returns true every { walletId } returns WALLET_ID_1 } - every { selectedWalletUseCase.selectedFlow() } returns flowOf(wallet) + every { getWalletsUseCase.invokeAsMap(any(), any()) } returns + MutableStateFlow(linkedMapOf(WALLET_ID_1 to wallet)) coEvery { expressRepository.getProviders(any(), any()) } throws RuntimeException("boom") val walletFetcher1 = relaxedWalletFetcher() every { walletFetcherFactory.create(WALLET_ID_1) } returns walletFetcher1 - val fetcher = createFetcher(utils) - advanceUntilIdle() - // Act — the provider error is swallowed, so the wallet pipeline must keep working. - walletsFlow.value = linkedMapOf(WALLET_ID_1 to mockk()) + val fetcher = createFetcher(utils) advanceUntilIdle() // Assert @@ -220,6 +215,7 @@ internal class DefaultAppTxHistoryFetcherTest { private fun createFetcher(utils: DefaultTxHistoryFetcherUtils) = DefaultAppTxHistoryFetcher( utils = utils, expressRepository = expressRepository, + onrampRepository = onrampRepository, getWalletsUseCase = getWalletsUseCase, selectedWalletUseCase = selectedWalletUseCase, walletTxHistoryFetcherFactory = walletFetcherFactory, diff --git a/data/txhistory/src/test/kotlin/com/tangem/data/txhistory/repository/converter/ExpressTxHistoryConverterTest.kt b/data/txhistory/src/test/kotlin/com/tangem/data/txhistory/repository/converter/ExpressTxHistoryConverterTest.kt index 81247ffdda..c2d160f1b0 100644 --- a/data/txhistory/src/test/kotlin/com/tangem/data/txhistory/repository/converter/ExpressTxHistoryConverterTest.kt +++ b/data/txhistory/src/test/kotlin/com/tangem/data/txhistory/repository/converter/ExpressTxHistoryConverterTest.kt @@ -31,8 +31,9 @@ internal class ExpressTxHistoryConverterTest { assertThat(swap.txInfo).isNull() assertThat(swap.tx.status).isEqualTo(ExpressExchangeStatus.Waiting) assertThat(swap.createdAtMillis).isEqualTo(DateTime.parse(CREATED_AT).millis) - assertThat(swap.tx.fromAsset.amount).isEqualTo(BigDecimal("1.5")) - assertThat(swap.tx.toAsset.amount).isEqualTo(BigDecimal("0.001")) + // Raw backend amounts are scaled by decimals into the human-readable value the domain model promises. + assertThat(swap.tx.fromAsset.amount).isEquivalentAccordingToCompareTo(BigDecimal("1.5")) + assertThat(swap.tx.toAsset.amount).isEquivalentAccordingToCompareTo(BigDecimal("0.001")) } @Test @@ -50,14 +51,14 @@ internal class ExpressTxHistoryConverterTest { @Test fun `GIVEN exchange entity with actual amount WHEN toOutgoingSwap THEN to-asset uses actual amount`() { - // Arrange - val entity = createExchangeEntity(toAmount = "0.001", toActualAmount = "0.00099") + // Arrange (raw minimal-unit amounts, to-asset decimals = 8) + val entity = createExchangeEntity(toAmount = "100000", toActualAmount = "99000") // Act val swap = swapConverter.convert(ExpressSwapConverter.Input(entity, provider = null, isOutgoing = true)) // Assert - assertThat(swap.tx.toAsset.amount).isEqualTo(BigDecimal("0.00099")) + assertThat(swap.tx.toAsset.amount).isEquivalentAccordingToCompareTo(BigDecimal("0.00099")) } @Test @@ -73,17 +74,18 @@ internal class ExpressTxHistoryConverterTest { assertThat(onramp.txInfo).isNull() assertThat(onramp.tx.status).isEqualTo(ExpressOnrampStatus.Finished) assertThat(onramp.tx.fromFiat.currencySymbol).isEqualTo("USD") - assertThat(onramp.tx.fromFiat.value).isEqualTo(BigDecimal("100.0")) + assertThat(onramp.tx.fromFiat.value).isEquivalentAccordingToCompareTo(BigDecimal("100")) assertThat(onramp.tx.fromFiat.decimals).isEqualTo(2) assertThat(onramp.tx.fromFiat.type).isEqualTo(AmountType.FiatType("USD")) - assertThat(onramp.tx.toAsset.amount).isEqualTo(BigDecimal("0.5")) + assertThat(onramp.tx.toAsset.amount).isEquivalentAccordingToCompareTo(BigDecimal("0.5")) } private fun createExchangeEntity( payinHash: String? = "payin", payoutHash: String? = "payout", status: String = "waiting", - toAmount: String = "0.001", + // Raw minimal-unit amount (to-asset decimals = 8) → 0.001 + toAmount: String = "100000", toActualAmount: String? = null, ) = ExpressExchangeEntity( txId = "tx-1", @@ -111,7 +113,8 @@ internal class ExpressTxHistoryConverterTest { contractAddress = "", network = "ethereum", decimals = 18, - amount = "1.5", + // Raw minimal-unit amount (decimals = 18) → 1.5 + amount = "1500000000000000000", actualAmount = null, ), to = ExpressExchangeEntity.AssetEmbedded( @@ -139,13 +142,15 @@ internal class ExpressTxHistoryConverterTest { createdAt = CREATED_AT, updatedAt = CREATED_AT, fromCurrencyCode = "USD", - fromAmount = "100.0", + // Raw minimal-unit fiat amount (precision = 2) → 100 + fromAmount = "10000", fromPrecision = 2, to = ExpressOnrampEntity.AssetEmbedded( contractAddress = "0xtoken", network = "ethereum", decimals = 18, - amount = "0.5", + // Raw minimal-unit amount (decimals = 18) → 0.5 + amount = "500000000000000000", actualAmount = null, ), paymentMethod = "card", diff --git a/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/SdkAmountConverter.kt b/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/SdkAmountConverter.kt new file mode 100644 index 0000000000..e89a1acb17 --- /dev/null +++ b/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/SdkAmountConverter.kt @@ -0,0 +1,25 @@ +package com.tangem.data.walletmanager.utils + +import com.tangem.domain.models.network.SdkAmount +import com.tangem.domain.models.network.SdkAmountType +import com.tangem.blockchain.common.Amount as BlockchainAmount +import com.tangem.blockchain.common.AmountType as BlockchainAmountType + +/** Maps the blockchain SDK [BlockchainAmount] to the serializable domain [SdkAmount]. */ +internal fun BlockchainAmount.toDomain(): SdkAmount = SdkAmount( + currencySymbol = currencySymbol, + value = value, + decimals = decimals, + type = type.toDomain(), +) + +private fun BlockchainAmountType.toDomain(): SdkAmountType = when (this) { + BlockchainAmountType.Coin -> SdkAmountType.Coin + BlockchainAmountType.Reserve -> SdkAmountType.Reserve + is BlockchainAmountType.FeeResource -> SdkAmountType.FeeResource(name = name) + is BlockchainAmountType.Token -> SdkAmountType.Token(contractAddress = token.contractAddress, id = token.id) + is BlockchainAmountType.TokenYieldSupply -> SdkAmountType.Token( + contractAddress = token.contractAddress, + id = token.id, + ) +} \ No newline at end of file diff --git a/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/SdkTransactionHistoryItemConverter.kt b/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/SdkTransactionHistoryItemConverter.kt index 9832632e12..c69bd21cc6 100644 --- a/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/SdkTransactionHistoryItemConverter.kt +++ b/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/SdkTransactionHistoryItemConverter.kt @@ -32,6 +32,7 @@ internal class SdkTransactionHistoryItemConverter( }, type = typeConverter.convert(value), amount = requireNotNull(value.amount.value) { "Transaction amount value must not be null" }, + fee = value.fee.toDomain(), ) private fun SdkTransactionHistoryItem.SourceType.toDomain(): TxInfo.SourceType = when (this) { diff --git a/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/TransactionDataToTxHistoryItemConverter.kt b/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/TransactionDataToTxHistoryItemConverter.kt index 1247fce030..07e601bc3e 100644 --- a/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/TransactionDataToTxHistoryItemConverter.kt +++ b/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/TransactionDataToTxHistoryItemConverter.kt @@ -47,6 +47,7 @@ internal class TransactionDataToTxHistoryItemConverter( }, type = getTransactionType(value), amount = amount, + fee = value.fee?.amount?.toDomain(), ) } diff --git a/domain/account/status/src/test/kotlin/com/tangem/domain/account/status/usecase/GetBackupProblematicWalletForAddressUseCaseTest.kt b/domain/account/status/src/test/kotlin/com/tangem/domain/account/status/usecase/GetBackupProblematicWalletForAddressUseCaseTest.kt index f20cd59184..3c682fac25 100644 --- a/domain/account/status/src/test/kotlin/com/tangem/domain/account/status/usecase/GetBackupProblematicWalletForAddressUseCaseTest.kt +++ b/domain/account/status/src/test/kotlin/com/tangem/domain/account/status/usecase/GetBackupProblematicWalletForAddressUseCaseTest.kt @@ -9,7 +9,7 @@ import com.tangem.domain.account.status.model.AccountCryptoCurrency import com.tangem.domain.card.IsWalletBackupProblematicUseCase import com.tangem.domain.models.wallet.UserWallet import com.tangem.domain.models.wallet.UserWalletId -import com.tangem.domain.wallets.models.GetUserWalletError +import com.tangem.domain.wallets.models.errors.GetUserWalletError import com.tangem.domain.wallets.usecase.GetUserWalletUseCase import io.mockk.clearMocks import io.mockk.coEvery diff --git a/domain/address-book/build.gradle.kts b/domain/address-book/build.gradle.kts index 02180ffe1e..9f15edfeb6 100644 --- a/domain/address-book/build.gradle.kts +++ b/domain/address-book/build.gradle.kts @@ -14,6 +14,7 @@ dependencies { api(projects.domain.core) api(projects.domain.models) + implementation(projects.domain.common) implementation(projects.domain.transaction) implementation(projects.domain.tokens) diff --git a/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/error/SaveContactError.kt b/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/error/SaveContactError.kt index f2c3e979ba..22f8b6a8d9 100644 --- a/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/error/SaveContactError.kt +++ b/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/error/SaveContactError.kt @@ -1,10 +1,13 @@ package com.tangem.domain.addressbook.error import com.tangem.domain.transaction.error.AddressValidation +import com.tangem.domain.transaction.error.SignHashesError sealed interface SaveContactError { data class Name(val error: ContactNameValidationError) : SaveContactError data class Address(val error: AddressValidation.Error) : SaveContactError + + data class Signing(val error: SignHashesError) : SaveContactError } \ No newline at end of file diff --git a/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/usecase/VerifyAddressEntriesUseCase.kt b/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/interactor/GetVerifiedContactsInteractor.kt similarity index 50% rename from domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/usecase/VerifyAddressEntriesUseCase.kt rename to domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/interactor/GetVerifiedContactsInteractor.kt index d82ecd9ee4..e008d841e5 100644 --- a/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/usecase/VerifyAddressEntriesUseCase.kt +++ b/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/interactor/GetVerifiedContactsInteractor.kt @@ -1,32 +1,42 @@ -package com.tangem.domain.addressbook.usecase +package com.tangem.domain.addressbook.interactor import arrow.core.Either import arrow.core.right import com.tangem.domain.addressbook.model.AddressEntriesVerification -import com.tangem.domain.addressbook.model.AddressEntry import com.tangem.domain.addressbook.model.Contact +import com.tangem.domain.addressbook.model.VerifiedContact +import com.tangem.domain.addressbook.usecase.GetContactsUseCase +import com.tangem.domain.addressbook.usecase.buildAddressEntryPayload +import com.tangem.domain.common.wallets.UserWalletsListRepository import com.tangem.domain.models.wallet.UserWallet +import com.tangem.domain.models.wallet.UserWalletId import com.tangem.domain.transaction.error.VerifyMessagesError import com.tangem.domain.transaction.usecase.VerifySecp256k1MessagesUseCase import com.tangem.utils.extensions.hexToBytesOrNull +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.map -/** - * Verifies each [AddressEntry] of a [Contact] against [userWallet] and partitions them into the ones - * whose signature was produced by that wallet ([AddressEntriesVerification.valid]) and the ones that - * were not ([AddressEntriesVerification.invalid]). The counterpart of [SignAddressEntriesUseCase]. - * - * An entry is **invalid** when its signature fails verification or is missing/malformed (non-hex); - * such entries should be hidden from the user. Both partitions preserve the contact's original entry - * order. An empty contact yields two empty lists. The wallet's signing key being unavailable surfaces - * as a [VerifyMessagesError.NoSigningKey] failure (the entries cannot be verified at all). - * - * Each entry is verified against the exact bytes that were signed (see [buildAddressEntryPayload]). - */ -class VerifyAddressEntriesUseCase( - private val verifyMessagesUseCase: VerifySecp256k1MessagesUseCase, +class GetVerifiedContactsInteractor( + private val getContacts: GetContactsUseCase, + private val verifyMessages: VerifySecp256k1MessagesUseCase, + private val userWalletsListRepository: UserWalletsListRepository, ) { - operator fun invoke( + operator fun invoke(query: String, userWalletId: UserWalletId? = null): Flow> { + return getContacts(query, userWalletId).map { contacts -> + val walletsById = userWalletsListRepository.userWalletsSync().associateBy { it.walletId } + contacts.mapNotNull { contact -> + val userWallet = walletsById[contact.walletId] ?: return@mapNotNull null + val verification = verify(userWallet, contact).getOrNull() ?: return@mapNotNull null + VerifiedContact( + contact = contact.copy(addressEntries = verification.valid), + invalidEntries = verification.invalid, + ) + } + } + } + + private fun verify( userWallet: UserWallet, contact: Contact, ): Either { @@ -40,7 +50,7 @@ class VerifyAddressEntriesUseCase( val messages = wellFormed.map { (entry, _) -> buildAddressEntryPayload(contact, entry) } val signatures = wellFormed.map { (_, signature) -> signature } - return verifyMessagesUseCase(userWallet = userWallet, messages = messages, signatures = signatures) + return verifyMessages(userWallet = userWallet, messages = messages, signatures = signatures) .map { flags -> val validIds = wellFormed .filterIndexed { index, _ -> flags[index] } diff --git a/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/interactor/SaveContactInteractor.kt b/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/interactor/SaveContactInteractor.kt new file mode 100644 index 0000000000..4bcd36a802 --- /dev/null +++ b/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/interactor/SaveContactInteractor.kt @@ -0,0 +1,104 @@ +package com.tangem.domain.addressbook.interactor + +import arrow.core.Either +import arrow.core.raise.either +import com.tangem.domain.addressbook.error.ContactNameValidationError +import com.tangem.domain.addressbook.error.SaveContactError +import com.tangem.domain.addressbook.model.AddressEntry +import com.tangem.domain.addressbook.model.Contact +import com.tangem.domain.addressbook.model.ContactId +import com.tangem.domain.addressbook.model.ContactName +import com.tangem.domain.addressbook.repository.AddressBookRepository +import com.tangem.domain.addressbook.time.IsoTimestampProvider +import com.tangem.domain.addressbook.usecase.ValidateContactNameUseCase +import com.tangem.domain.addressbook.usecase.buildAddressEntryPayload +import com.tangem.domain.models.wallet.UserWallet +import com.tangem.domain.transaction.error.SignHashesError +import com.tangem.domain.transaction.usecase.SignUseCase +import com.tangem.domain.transaction.usecase.primarySecp256k1PublicKey +import com.tangem.utils.extensions.toHexString +import java.security.MessageDigest +import java.util.UUID + +class SaveContactInteractor( + private val repository: AddressBookRepository, + private val validateContactName: ValidateContactNameUseCase, + private val signUseCase: SignUseCase, + private val timestampProvider: IsoTimestampProvider, +) { + + suspend fun createContact( + userWallet: UserWallet, + name: String, + iconColor: String, + addressEntries: List, + ): Either = either { + val userWalletId = userWallet.walletId + val validName = validateContactName(userWalletId, name) + .mapLeft(SaveContactError::Name) + .bind() + + val now = timestampProvider.now() + val contact = Contact( + id = ContactId(UUID.randomUUID().toString()), + walletId = userWalletId, + name = validName, + icon = "", + iconColor = iconColor, + createdAt = now, + updatedAt = now, + addressEntries = addressEntries, + ) + val signed = signAddressEntries(userWallet, contact) + .mapLeft(SaveContactError::Signing) + .bind() + repository.saveContact(signed) + signed + } + + suspend fun updateContact( + userWallet: UserWallet, + contact: Contact, + name: String, + iconColor: String, + addressEntries: List, + ): Either = either { + val validName = ContactName(name) + .mapLeft { SaveContactError.Name(ContactNameValidationError.Format(it)) } + .bind() + + val updated = contact.copy( + name = validName, + iconColor = iconColor, + addressEntries = addressEntries, + updatedAt = timestampProvider.now(), + ) + val signed = signAddressEntries(userWallet, updated) + .mapLeft(SaveContactError::Signing) + .bind() + repository.saveContact(signed) + signed + } + + private suspend fun signAddressEntries( + userWallet: UserWallet, + contact: Contact, + ): Either = either { + val entries = contact.addressEntries + if (entries.isEmpty()) return@either contact + + val publicKey = userWallet.primarySecp256k1PublicKey() ?: raise(SignHashesError.NoSigningKey) + val hashes = entries.map { entry -> hashEntry(contact, entry) } + val signatures = signUseCase(hashes = hashes, publicKey = publicKey, userWallet = userWallet).bind() + + val signedEntries = entries.mapIndexed { index, entry -> + entry.copy(signature = signatures[index].toHexString()) + } + contact.copy(addressEntries = signedEntries) + } + + private fun hashEntry(contact: Contact, entry: AddressEntry): ByteArray { + val payload = buildAddressEntryPayload(contact, entry) + return MessageDigest.getInstance("SHA-256").digest(payload) + } +} \ No newline at end of file diff --git a/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/model/AddressEntry.kt b/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/model/AddressEntry.kt index 4ed3388f27..616eeebe2a 100644 --- a/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/model/AddressEntry.kt +++ b/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/model/AddressEntry.kt @@ -9,6 +9,7 @@ data class AddressEntry( val id: AddressEntryId, val address: String, val networkId: Network.RawID, + val networkName: String, val memo: String?, val signature: String, ) \ No newline at end of file diff --git a/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/model/Contact.kt b/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/model/Contact.kt index 2cf5cae408..8697b62900 100644 --- a/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/model/Contact.kt +++ b/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/model/Contact.kt @@ -15,6 +15,8 @@ data class Contact( val id: ContactId, val walletId: UserWalletId, val name: ContactName, + val icon: String, + val iconColor: String, val createdAt: String, val updatedAt: String, val addressEntries: List, diff --git a/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/model/VerifiedContact.kt b/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/model/VerifiedContact.kt new file mode 100644 index 0000000000..4568d5d3d7 --- /dev/null +++ b/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/model/VerifiedContact.kt @@ -0,0 +1,12 @@ +package com.tangem.domain.addressbook.model + +/** + * @property contact the contact carrying only the entries whose signatures verified against the + * wallet — what should be shown to the user. + * @property invalidEntries entries that failed verification (tampered, signed by another wallet, or + * malformed). Hidden from the UI but kept for analytics. + */ +data class VerifiedContact( + val contact: Contact, + val invalidEntries: List, +) \ No newline at end of file diff --git a/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/repository/AddressBookRepository.kt b/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/repository/AddressBookRepository.kt index 71858fae3e..41fd877268 100644 --- a/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/repository/AddressBookRepository.kt +++ b/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/repository/AddressBookRepository.kt @@ -8,10 +8,11 @@ import kotlinx.coroutines.flow.Flow /** Persistence port for the address book. The implementation is provided by the data layer. */ interface AddressBookRepository { + /** Contacts for a single wallet. Each [Contact] keeps its own [Contact.walletId]. */ fun getContacts(userWalletId: UserWalletId): Flow> - /** Contacts across several wallets, flattened. Each [Contact] keeps its own [Contact.walletId]. */ - fun getContacts(userWalletIds: Set): Flow> + /** Contacts across all wallets (flattened). Each [Contact] keeps its own [Contact.walletId]. */ + fun getAllContacts(): Flow> suspend fun getContact(userWalletId: UserWalletId, name: String): Contact? diff --git a/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/usecase/AddressEntrySigningPayload.kt b/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/usecase/AddressEntrySigningPayload.kt index 4a2cde23e9..cd0101bf0e 100644 --- a/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/usecase/AddressEntrySigningPayload.kt +++ b/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/usecase/AddressEntrySigningPayload.kt @@ -7,7 +7,7 @@ import com.tangem.domain.addressbook.model.Contact * Builds the canonical bytes that are signed for a single [AddressEntry]: * `address + networkId + memo + contactId + name`. * - * Shared by [SignAddressEntriesUseCase] (which hashes and signs it) and [VerifyAddressEntriesUseCase] + * Shared by `SaveContactInteractor` (which hashes and signs it) and `GetVerifiedContactsInteractor` * (which verifies the signature against it), so the signed and verified payloads can never diverge. */ internal fun buildAddressEntryPayload(contact: Contact, entry: AddressEntry): ByteArray { diff --git a/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/usecase/CreateContactUseCase.kt b/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/usecase/CreateContactUseCase.kt deleted file mode 100644 index f7e861cd6f..0000000000 --- a/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/usecase/CreateContactUseCase.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.tangem.domain.addressbook.usecase - -import arrow.core.Either -import arrow.core.raise.either -import com.tangem.domain.addressbook.error.SaveContactError -import com.tangem.domain.addressbook.model.AddressEntry -import com.tangem.domain.addressbook.model.Contact -import com.tangem.domain.addressbook.model.ContactId -import com.tangem.domain.addressbook.repository.AddressBookRepository -import com.tangem.domain.addressbook.time.IsoTimestampProvider -import com.tangem.domain.models.network.Network -import com.tangem.domain.models.wallet.UserWalletId -import java.util.UUID - -/** - * Creates a new [Contact] with client-generated UUID v4 ids. The name must be valid and unique - - * the current time. - */ -class CreateContactUseCase( - private val repository: AddressBookRepository, - private val validateContactName: ValidateContactNameUseCase, - private val timestampProvider: IsoTimestampProvider, -) { - - @Suppress("LongParameterList") - suspend operator fun invoke( - userWalletId: UserWalletId, - name: String, - network: Network, - addressEntries: List, - ): Either = either { - val validName = validateContactName(userWalletId, name) - .mapLeft(SaveContactError::Name) - .bind() - - val now = timestampProvider.now() - val contact = Contact( - id = ContactId(UUID.randomUUID().toString()), - walletId = userWalletId, - name = validName, - createdAt = now, - updatedAt = now, - addressEntries = addressEntries, - ) - repository.saveContact(contact) - contact - } -} \ No newline at end of file diff --git a/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/usecase/GetContactsUseCase.kt b/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/usecase/GetContactsUseCase.kt index 71f56c7d7c..acf8409dc1 100644 --- a/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/usecase/GetContactsUseCase.kt +++ b/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/usecase/GetContactsUseCase.kt @@ -4,10 +4,28 @@ import com.tangem.domain.addressbook.model.Contact import com.tangem.domain.addressbook.repository.AddressBookRepository import com.tangem.domain.models.wallet.UserWalletId import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.map class GetContactsUseCase( private val repository: AddressBookRepository, ) { - operator fun invoke(userWalletIds: Set): Flow> = repository.getContacts(userWalletIds) + operator fun invoke(query: String, userWalletId: UserWalletId? = null): Flow> { + val source = if (userWalletId == null) { + repository.getAllContacts() + } else { + repository.getContacts(userWalletId) + } + val normalizedQuery = query.trim() + if (normalizedQuery.isEmpty()) return source + return source.map { contacts -> contacts.filter { it.matches(normalizedQuery) } } + } + + private fun Contact.matches(query: String): Boolean { + val isNameContaining = name.value.contains(other = query, ignoreCase = true) + val isAddressContaining = addressEntries.any { addressEntry -> + addressEntry.address.contains(other = query, ignoreCase = true) + } + return isNameContaining || isAddressContaining + } } \ No newline at end of file diff --git a/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/usecase/SignAddressEntriesUseCase.kt b/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/usecase/SignAddressEntriesUseCase.kt deleted file mode 100644 index 525745b768..0000000000 --- a/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/usecase/SignAddressEntriesUseCase.kt +++ /dev/null @@ -1,41 +0,0 @@ -package com.tangem.domain.addressbook.usecase - -import arrow.core.Either -import arrow.core.raise.either -import com.tangem.domain.addressbook.model.AddressEntry -import com.tangem.domain.addressbook.model.Contact -import com.tangem.domain.models.wallet.UserWallet -import com.tangem.domain.transaction.error.SignHashesError -import com.tangem.domain.transaction.usecase.SignUseCase -import com.tangem.domain.transaction.usecase.primarySecp256k1PublicKey -import com.tangem.utils.extensions.toHexString -import java.security.MessageDigest - -/** - * Signs every [AddressEntry] of a [Contact] with the wallet's primary secp256k1 key in a single - * signing session (one card tap). Each entry is hashed as `SHA-256(address + networkId + memo + - * contactId + name)` and the produced signature is stored back into [AddressEntry.signature]. - */ -class SignAddressEntriesUseCase( - private val signUseCase: SignUseCase, -) { - - suspend operator fun invoke(userWallet: UserWallet, contact: Contact): Either = either { - val entries = contact.addressEntries - if (entries.isEmpty()) return@either contact - - val publicKey = userWallet.primarySecp256k1PublicKey() ?: raise(SignHashesError.NoSigningKey) - val hashes = entries.map { entry -> hashEntry(contact, entry) } - val signatures = signUseCase(hashes = hashes, publicKey = publicKey, userWallet = userWallet).bind() - - val signedEntries = entries.mapIndexed { index, entry -> - entry.copy(signature = signatures[index].toHexString()) - } - contact.copy(addressEntries = signedEntries) - } - - private fun hashEntry(contact: Contact, entry: AddressEntry): ByteArray { - val payload = buildAddressEntryPayload(contact, entry) - return MessageDigest.getInstance("SHA-256").digest(payload) - } -} \ No newline at end of file diff --git a/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/usecase/UpdateContactUseCase.kt b/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/usecase/UpdateContactUseCase.kt deleted file mode 100644 index 3f6580f0f4..0000000000 --- a/domain/address-book/src/main/kotlin/com/tangem/domain/addressbook/usecase/UpdateContactUseCase.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.tangem.domain.addressbook.usecase - -import arrow.core.Either -import arrow.core.raise.either -import com.tangem.domain.addressbook.error.ContactNameValidationError -import com.tangem.domain.addressbook.error.SaveContactError -import com.tangem.domain.addressbook.model.AddressEntry -import com.tangem.domain.addressbook.model.Contact -import com.tangem.domain.addressbook.model.ContactName -import com.tangem.domain.addressbook.repository.AddressBookRepository -import com.tangem.domain.addressbook.time.IsoTimestampProvider - -/** - - * format-checked — uniqueness is not re-validated on update. Address entries must be prepared and - * validated before calling this use case. [Contact.updatedAt] is restamped with the current time. - */ -class UpdateContactUseCase( - private val repository: AddressBookRepository, - private val timestampProvider: IsoTimestampProvider, -) { - - suspend operator fun invoke( - contact: Contact, - name: String, - addressEntries: List, - ): Either = either { - val validName = ContactName(name) - .mapLeft { SaveContactError.Name(ContactNameValidationError.Format(it)) } - .bind() - - val updated = contact.copy( - name = validName, - addressEntries = addressEntries, - updatedAt = timestampProvider.now(), - ) - repository.saveContact(updated) - updated - } -} \ No newline at end of file diff --git a/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/crypto/AddressBookCipherTest.kt b/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/crypto/AddressBookCipherTest.kt index 3f6371f5a5..078caec724 100644 --- a/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/crypto/AddressBookCipherTest.kt +++ b/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/crypto/AddressBookCipherTest.kt @@ -36,8 +36,16 @@ internal class AddressBookCipherTest { fun `GIVEN multi-contact book WHEN encrypt then decrypt THEN original book is restored`() { // Arrange val book = addressBook( - contact("Alice", entry("addr-1", "0xabc", memo = "memo")), - contact("Bob", entry("addr-2", "0xdef", memo = null)), + contact( + name = "Alice", + iconColor = "TestColor1", + entries = arrayOf(entry("addr-1", "0xabc", memo = "memo")), + ), + contact( + name = "Bob", + iconColor = "TestColor2", + entries = arrayOf(entry("addr-2", "0xdef", memo = null)), + ), ) // Act @@ -64,7 +72,13 @@ internal class AddressBookCipherTest { @Test fun `GIVEN a book WHEN encrypt THEN blob metadata and field sizes match the spec`() { // Arrange - val book = addressBook(contact("Alice", entry("addr-1", "0xabc", memo = null))) + val book = addressBook( + contact( + name = "Alice", + iconColor = "TestColor", + entries = arrayOf(entry("addr-1", "0xabc", memo = null)), + ) + ) // Act val blob = cipher.encrypt(book, wallet, updatedAt).rightValue() @@ -94,7 +108,13 @@ internal class AddressBookCipherTest { @Test fun `GIVEN same book encrypted twice WHEN compared THEN nonce differs but both decrypt to original`() { // Arrange - val book = addressBook(contact("Alice", entry("addr-1", "0xabc", memo = null))) + val book = addressBook( + contact( + name = "Alice", + iconColor = "TestColor", + entries = arrayOf(entry("addr-1", "0xabc", memo = null)), + ) + ) // Act val first = cipher.encrypt(book, wallet, updatedAt).rightValue() @@ -201,20 +221,42 @@ internal class AddressBookCipherTest { assertThat(result.leftValue()).isEqualTo(AddressBookCryptoError.NoWalletPublicKey) } + // region cross-platform vectors + // Shared known-answer vector, identical to iOS CommonAddressBookEncryptionServiceTests. Asserting the + // same bytes on both platforms guarantees a blob sealed on one opens on the other. Do not change these + // constants without changing the iOS suite in lockstep. + @Test - fun `GIVEN fixed public key WHEN deriveAesKey THEN matches the locked HMAC-SHA256 vector`() { - // Arrange — independently computed: HMAC-SHA256(SHA-256([01,02,03,04]), "TokensSymmetricKey") - val publicKey = byteArrayOf(0x01, 0x02, 0x03, 0x04) - val expected = "da48094b89902e137ae73ae90acbd809af9ad4f648044c17e7ee6de73e96b0c2" + fun `GIVEN shared cross-platform public key WHEN deriveAesKey THEN matches the iOS vector`() { + // Arrange + val publicKey = VECTOR_PUBLIC_KEY_HEX.hexToBytes() // Act val aesKey = AddressBookKeyDerivation.deriveAesKey(publicKey) // Assert assertThat(aesKey).hasLength(AES_256_KEY_BYTES) - assertThat(aesKey.toHexString().lowercase()).isEqualTo(expected) + assertThat(aesKey.toHexString().lowercase()).isEqualTo(VECTOR_KEY_HEX) } + @Test + fun `GIVEN a blob sealed on the other platform WHEN decrypt with the derived key THEN restores the plaintext`() { + // Arrange — open the iOS-produced AES-256-GCM box with the key derived from the shared seed + val aesKey = AddressBookKeyDerivation.deriveAesKey(VECTOR_PUBLIC_KEY_HEX.hexToBytes()) + + // Act + val plaintext = aesGcmOpen( + key = aesKey, + nonce = VECTOR_NONCE_HEX.hexToBytes(), + ciphertext = VECTOR_CIPHERTEXT_HEX.hexToBytes(), + authTag = VECTOR_TAG_HEX.hexToBytes(), + ) + + // Assert + assertThat(plaintext.toString(Charsets.UTF_8)).isEqualTo(VECTOR_PLAINTEXT) + } + // endregion + // region helpers private fun addressBook(vararg contacts: Contact): AddressBook = AddressBook(walletId = wallet.walletId, contacts = contacts.toList()) @@ -222,10 +264,12 @@ internal class AddressBookCipherTest { private fun addressBook(walletId: UserWalletId): AddressBook = AddressBook(walletId = walletId, contacts = emptyList()) - private fun contact(name: String, vararg entries: AddressEntry): Contact = Contact( + private fun contact(name: String, iconColor: String, vararg entries: AddressEntry): Contact = Contact( id = ContactId("contact-$name"), walletId = wallet.walletId, name = requireNotNull(ContactName(name).getOrNull()), + icon = "", + iconColor = iconColor, createdAt = "2026-01-01T00:00:00.000Z", updatedAt = "2026-05-22T09:00:00.000Z", addressEntries = entries.toList(), @@ -237,10 +281,19 @@ internal class AddressBookCipherTest { networkId = Network.RawID("ethereum"), memo = memo, signature = "", + networkName = "Ethereum", ) private fun String.flipFirstHexNibble(): String = (if (first() == '0') '1' else '0') + substring(1) + private fun String.hexToBytes(): ByteArray = chunked(2).map { it.toInt(16).toByte() }.toByteArray() + + /** Raw AES-256-GCM open, mirroring [AddressBookCipher]'s transformation and tag size. */ + private fun aesGcmOpen(key: ByteArray, nonce: ByteArray, ciphertext: ByteArray, authTag: ByteArray): ByteArray = + Cipher.getInstance("AES/GCM/NoPadding").apply { + init(Cipher.DECRYPT_MODE, SecretKeySpec(key, "AES"), GCMParameterSpec(TAG_BITS, nonce)) + }.doFinal(ciphertext + authTag) + private fun Either.rightValue(): T = getOrNull() ?: error("Expected Either.Right but was $this") @@ -272,5 +325,13 @@ internal class AddressBookCipherTest { const val NONCE_HEX_LENGTH = NONCE_BYTES * 2 const val TAG_HEX_LENGTH = TAG_BYTES * 2 const val AES_256_KEY_BYTES = 32 + + // Shared cross-platform known-answer vector (see iOS CommonAddressBookEncryptionServiceTests). + const val VECTOR_PUBLIC_KEY_HEX = "0374d0f81f42ddfe34114d533e95e6ae5fe6ea271c96f1fa505199fdc365ae9720" + const val VECTOR_KEY_HEX = "59b85ce53fac0a8493d9d8d9c0d32adb5f586741dd8bbfd9348a3212e493730d" + const val VECTOR_NONCE_HEX = "000102030405060708090a0b" + const val VECTOR_CIPHERTEXT_HEX = "f4ee0f404e747b5b5cca730c44baf86ca3d8f6fbdf66ff2fe98d3b8f88cb23df7ff55b52205f32c8ab" + const val VECTOR_TAG_HEX = "6c4b71b27958f43afc6633850369a17a" + const val VECTOR_PLAINTEXT = "Tangem Address Book cross-platform vector" } } \ No newline at end of file diff --git a/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/interactor/GetVerifiedContactsInteractorTest.kt b/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/interactor/GetVerifiedContactsInteractorTest.kt new file mode 100644 index 0000000000..f0d6b4524f --- /dev/null +++ b/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/interactor/GetVerifiedContactsInteractorTest.kt @@ -0,0 +1,209 @@ +package com.tangem.domain.addressbook.interactor + +import arrow.core.left +import arrow.core.right +import com.google.common.truth.Truth.assertThat +import com.tangem.domain.addressbook.model.AddressEntry +import com.tangem.domain.addressbook.model.AddressEntryId +import com.tangem.domain.addressbook.model.Contact +import com.tangem.domain.addressbook.model.ContactId +import com.tangem.domain.addressbook.model.ContactName +import com.tangem.domain.addressbook.model.VerifiedContact +import com.tangem.domain.addressbook.usecase.GetContactsUseCase +import com.tangem.domain.common.wallets.UserWalletsListRepository +import com.tangem.domain.models.network.Network +import com.tangem.domain.models.wallet.UserWallet +import com.tangem.domain.models.wallet.UserWalletId +import com.tangem.domain.transaction.error.VerifyMessagesError +import com.tangem.domain.transaction.usecase.VerifySecp256k1MessagesUseCase +import com.tangem.utils.extensions.toHexString +import io.mockk.clearMocks +import io.mockk.coEvery +import io.mockk.every +import io.mockk.mockk +import io.mockk.slot +import io.mockk.verify +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.flowOf +import kotlinx.coroutines.test.runTest +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.TestInstance + +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +class GetVerifiedContactsInteractorTest { + + private val getContacts: GetContactsUseCase = mockk() + private val verifyMessages: VerifySecp256k1MessagesUseCase = mockk() + private val userWalletsListRepository: UserWalletsListRepository = mockk() + + private val interactor = GetVerifiedContactsInteractor( + getContacts = getContacts, + verifyMessages = verifyMessages, + userWalletsListRepository = userWalletsListRepository, + ) + + private val walletId = UserWalletId("011") + private val userWallet: UserWallet = mockk { every { walletId } returns this@GetVerifiedContactsInteractorTest.walletId } + + @BeforeEach + fun resetMocks() { + clearMocks(getContacts, verifyMessages, userWalletsListRepository) + coEvery { userWalletsListRepository.userWalletsSync() } returns listOf(userWallet) + } + + @Test + fun `GIVEN mixed entries WHEN invoke THEN displays only valid AND keeps invalid for analytics`() = runTest { + // Arrange + val valid = entry(id = "valid", address = "0xvalid", memo = null, signature = "AABB") + val invalid = entry(id = "invalid", address = "0xinvalid", memo = null, signature = "CCDD") + val contact = contact(valid, invalid) + stubContacts(contact) + every { verifyMessages(any(), any(), any()) } returns listOf(true, false).right() + + // Act + val result = interactor(query = "").first() + + // Assert + assertThat(result).containsExactly( + VerifiedContact( + contact = contact.copy(addressEntries = listOf(valid)), + invalidEntries = listOf(invalid), + ), + ) + } + + @Test + fun `GIVEN contact with entries WHEN invoke THEN verifies each entry payload and its signature`() = runTest { + // Arrange + val contact = contact( + entry(id = "addr-1", address = "0xabc", memo = "memo", signature = "AABB"), + entry(id = "addr-2", address = "0xdef", memo = null, signature = "CCDD"), + ) + stubContacts(contact) + val messagesSlot = slot>() + val signaturesSlot = slot>() + every { + verifyMessages(eq(userWallet), capture(messagesSlot), capture(signaturesSlot)) + } returns listOf(true, true).right() + + // Act + interactor(query = "").first() + + // Assert + assertThat(messagesSlot.captured.map { String(it) }) + .containsExactly( + expectedPayload(contact, contact.addressEntries[0]), + expectedPayload(contact, contact.addressEntries[1]), + ) + .inOrder() + assertThat(signaturesSlot.captured.map { it.toHexString() }).containsExactly("AABB", "CCDD").inOrder() + } + + @Test + fun `GIVEN some entries fail verification WHEN invoke THEN partitions them preserving order`() = runTest { + // Arrange + val valid1 = entry(id = "addr-1", address = "0xabc", memo = null, signature = "AABB") + val invalid = entry(id = "addr-2", address = "0xdef", memo = null, signature = "CCDD") + val valid2 = entry(id = "addr-3", address = "0xghi", memo = null, signature = "EEFF") + val contact = contact(valid1, invalid, valid2) + stubContacts(contact) + every { verifyMessages(any(), any(), any()) } returns listOf(true, false, true).right() + + // Act + val result = interactor(query = "").first().single() + + // Assert + assertThat(result.contact.addressEntries).containsExactly(valid1, valid2).inOrder() + assertThat(result.invalidEntries).containsExactly(invalid) + } + + @Test + fun `GIVEN malformed signature WHEN invoke THEN that entry is invalid and excluded from verification`() = runTest { + // Arrange + val malformed = entry(id = "addr-1", address = "0xabc", memo = null, signature = "not-hex") + val signed = entry(id = "addr-2", address = "0xdef", memo = null, signature = "AABB") + val contact = contact(malformed, signed) + stubContacts(contact) + val signaturesSlot = slot>() + every { + verifyMessages(eq(userWallet), any(), capture(signaturesSlot)) + } returns listOf(true).right() + + // Act + val result = interactor(query = "").first().single() + + // Assert + assertThat(signaturesSlot.captured.map { it.toHexString() }).containsExactly("AABB") + assertThat(result.contact.addressEntries).containsExactly(signed) + assertThat(result.invalidEntries).containsExactly(malformed) + } + + @Test + fun `GIVEN contact with no entries WHEN invoke THEN keeps contact without verifying`() = runTest { + // Arrange + val contact = contact() + stubContacts(contact) + + // Act + val result = interactor(query = "").first().single() + + // Assert + assertThat(result.contact.addressEntries).isEmpty() + assertThat(result.invalidEntries).isEmpty() + verify(exactly = 0) { verifyMessages(any(), any(), any()) } + } + + @Test + fun `GIVEN wallet cannot be resolved WHEN invoke THEN contact is dropped`() = runTest { + // Arrange + coEvery { userWalletsListRepository.userWalletsSync() } returns emptyList() + stubContacts(contact(entry(id = "addr-1", address = "0xabc", memo = null, signature = "AABB"))) + + // Act + val result = interactor(query = "").first() + + // Assert + assertThat(result).isEmpty() + } + + @Test + fun `GIVEN verification fails WHEN invoke THEN contact is dropped`() = runTest { + // Arrange + stubContacts(contact(entry(id = "addr-1", address = "0xabc", memo = null, signature = "AABB"))) + every { verifyMessages(any(), any(), any()) } returns VerifyMessagesError.NoSigningKey.left() + + // Act + val result = interactor(query = "").first() + + // Assert + assertThat(result).isEmpty() + } + + private fun stubContacts(vararg contacts: Contact) { + every { getContacts(query = "", userWalletId = null) } returns flowOf(contacts.toList()) + } + + private fun contact(vararg entries: AddressEntry): Contact = Contact( + id = ContactId("contact-1"), + walletId = walletId, + name = requireNotNull(ContactName("Alice").getOrNull()), + icon = "", + iconColor = "KekColor", + createdAt = "2026-01-01T00:00:00.000Z", + updatedAt = "2026-01-01T00:00:00.000Z", + addressEntries = entries.toList(), + ) + + private fun entry(id: String, address: String, memo: String?, signature: String): AddressEntry = AddressEntry( + id = AddressEntryId(id), + address = address, + networkId = Network.RawID("ethereum"), + networkName = "Ethereum", + memo = memo, + signature = signature, + ) + + private fun expectedPayload(contact: Contact, entry: AddressEntry): String = + entry.address + entry.networkId.value + entry.memo.orEmpty() + contact.id.value + contact.name.value +} \ No newline at end of file diff --git a/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/interactor/SaveContactInteractorTest.kt b/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/interactor/SaveContactInteractorTest.kt new file mode 100644 index 0000000000..961e8fb25f --- /dev/null +++ b/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/interactor/SaveContactInteractorTest.kt @@ -0,0 +1,318 @@ +package com.tangem.domain.addressbook.interactor + +import arrow.core.left +import arrow.core.right +import com.google.common.truth.Truth.assertThat +import com.tangem.common.test.domain.wallet.MockUserWalletFactory +import com.tangem.domain.addressbook.error.ContactNameValidationError +import com.tangem.domain.addressbook.error.SaveContactError +import com.tangem.domain.addressbook.model.AddressEntry +import com.tangem.domain.addressbook.model.AddressEntryId +import com.tangem.domain.addressbook.model.Contact +import com.tangem.domain.addressbook.model.ContactId +import com.tangem.domain.addressbook.model.ContactName +import com.tangem.domain.addressbook.repository.AddressBookRepository +import com.tangem.domain.addressbook.time.IsoTimestampProvider +import com.tangem.domain.addressbook.usecase.ValidateContactNameUseCase +import com.tangem.domain.models.network.Network +import com.tangem.domain.models.wallet.UserWallet +import com.tangem.domain.models.wallet.UserWalletId +import com.tangem.domain.transaction.error.SignHashesError +import com.tangem.domain.transaction.usecase.SignUseCase +import com.tangem.utils.extensions.toHexString +import io.mockk.clearMocks +import io.mockk.coEvery +import io.mockk.coVerify +import io.mockk.every +import io.mockk.mockk +import io.mockk.slot +import kotlinx.coroutines.flow.flowOf +import kotlinx.coroutines.test.runTest +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Nested +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.TestInstance +import java.security.MessageDigest + +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +internal class SaveContactInteractorTest { + + private val repository: AddressBookRepository = mockk(relaxUnitFun = true) + private val signUseCase: SignUseCase = mockk() + private val timestampProvider: IsoTimestampProvider = mockk { + every { now() } returns NEW_TIMESTAMP + } + private val interactor = SaveContactInteractor( + repository = repository, + validateContactName = ValidateContactNameUseCase(repository), + signUseCase = signUseCase, + timestampProvider = timestampProvider, + ) + + // MockUserWalletFactory builds each wallet key with publicKey = curve.name bytes → secp256k1 key is "Secp256k1" + private val userWallet: UserWallet = MockUserWalletFactory.create() + private val secp256k1Key = "Secp256k1".toByteArray() + private val networkRawId = Network.RawID("ethereum") + + @BeforeEach + fun resetMocks() { + clearMocks(repository, signUseCase, answers = false) + } + + @Nested + @TestInstance(TestInstance.Lifecycle.PER_CLASS) + inner class CreateContact { + + private val entries = listOf(entry(id = "addr-1", address = "0xabc", memo = "memo")) + + @Test + fun `GIVEN unique name WHEN createContact THEN generates ids AND persists the signed contact`() = runTest { + // Arrange + stubNoExistingContacts() + val signatures = listOf(byteArrayOf(0x01, 0xAB.toByte())) + coEvery { signUseCase(hashes = any(), publicKey = any(), userWallet = eq(userWallet)) } returns + signatures.right() + val saved = slot() + coEvery { repository.saveContact(capture(saved)) } returns Unit + + // Act + val result = interactor.createContact(userWallet, name = "Alice", iconColor = "TestColor", entries) + + // Assert + val contact = result.getOrNull() + assertThat(contact).isEqualTo(saved.captured) + assertThat(contact!!.walletId).isEqualTo(userWallet.walletId) + assertThat(contact.name.value).isEqualTo("Alice") + assertThat(contact.id.value).isNotEmpty() + assertThat(contact.createdAt).isEqualTo(NEW_TIMESTAMP) + assertThat(contact.updatedAt).isEqualTo(NEW_TIMESTAMP) + assertThat(contact.addressEntries.map { it.signature }) + .containsExactly(signatures[0].toHexString()) + } + + @Test + fun `GIVEN entries WHEN createContact THEN signs each with the wallet key over the canonical payload`() = + runTest { + // Arrange + stubNoExistingContacts() + val twoEntries = listOf( + entry(id = "addr-1", address = "0xabc", memo = "memo"), + entry(id = "addr-2", address = "0xdef", memo = null), + ) + val signatures = listOf(byteArrayOf(0x01, 0xAB.toByte()), byteArrayOf(0xCD.toByte())) + val hashesSlot = slot>() + val publicKeySlot = slot() + coEvery { + signUseCase(hashes = capture(hashesSlot), publicKey = capture(publicKeySlot), userWallet = eq(userWallet)) + } returns signatures.right() + val saved = slot() + coEvery { repository.saveContact(capture(saved)) } returns Unit + + // Act + interactor.createContact(userWallet, name = "Alice", iconColor = "TestColor", twoEntries) + + // Assert + assertThat(publicKeySlot.captured).isEqualTo(secp256k1Key) + val persisted = saved.captured + assertThat(hashesSlot.captured.map { it.toHexString() }) + .containsExactly( + expectedHash(persisted, twoEntries[0]).toHexString(), + expectedHash(persisted, twoEntries[1]).toHexString(), + ) + .inOrder() + assertThat(persisted.addressEntries.map { it.signature }) + .containsExactly(signatures[0].toHexString(), signatures[1].toHexString()) + .inOrder() + } + + @Test + fun `GIVEN no entries WHEN createContact THEN persists without signing`() = runTest { + // Arrange + stubNoExistingContacts() + val saved = slot() + coEvery { repository.saveContact(capture(saved)) } returns Unit + + // Act + val result = interactor.createContact(userWallet, name = "Alice", iconColor = "TestColor", emptyList()) + + // Assert + assertThat(result.getOrNull()).isEqualTo(saved.captured) + assertThat(saved.captured.addressEntries).isEmpty() + coVerify(exactly = 0) { signUseCase(any>(), any(), any()) } + } + + @Test + fun `GIVEN wallet without a secp256k1 key WHEN createContact THEN Signing NoSigningKey without persisting`() = + runTest { + // Arrange — a locked hot wallet exposes no key; validation must still pass first + val lockedWallet = mockk { + every { walletId } returns userWallet.walletId + every { wallets } returns null + } + stubNoExistingContacts() + + // Act + val result = interactor.createContact(lockedWallet, name = "Alice", iconColor = "TestColor", entries) + + // Assert + assertThat(result.leftOrNull()) + .isEqualTo(SaveContactError.Signing(SignHashesError.NoSigningKey)) + coVerify(exactly = 0) { repository.saveContact(any()) } + } + + @Test + fun `GIVEN signUseCase fails WHEN createContact THEN propagates Signing error without persisting`() = runTest { + // Arrange + stubNoExistingContacts() + coEvery { signUseCase(hashes = any(), publicKey = any(), userWallet = any()) } returns + SignHashesError.SigningFailed(message = "canceled").left() + + // Act + val result = interactor.createContact(userWallet, name = "Alice", iconColor = "TestColor", entries) + + // Assert + assertThat(result.leftOrNull()) + .isEqualTo(SaveContactError.Signing(SignHashesError.SigningFailed(message = "canceled"))) + coVerify(exactly = 0) { repository.saveContact(any()) } + } + + @Test + fun `GIVEN duplicate name WHEN createContact THEN Name Duplicate without persisting`() = runTest { + // Arrange + every { repository.getContacts(userWallet.walletId) } returns flowOf(listOf(contact(name = "Alice"))) + + // Act + val result = interactor.createContact(userWallet, name = "alice", iconColor = "TestColor", entries) + + // Assert + assertThat(result.leftOrNull()) + .isEqualTo(SaveContactError.Name(ContactNameValidationError.Duplicate)) + coVerify(exactly = 0) { repository.saveContact(any()) } + } + + @Test + fun `GIVEN blank name WHEN createContact THEN Name Format without persisting`() = runTest { + // Arrange + stubNoExistingContacts() + + // Act + val result = interactor.createContact(userWallet, name = "", iconColor = "TestColor", entries) + + // Assert + assertThat(result.leftOrNull()) + .isEqualTo(SaveContactError.Name(ContactNameValidationError.Format(ContactName.Error.Empty))) + coVerify(exactly = 0) { repository.saveContact(any()) } + } + + private fun stubNoExistingContacts() { + every { repository.getContacts(userWallet.walletId) } returns flowOf(emptyList()) + } + } + + @Nested + @TestInstance(TestInstance.Lifecycle.PER_CLASS) + inner class UpdateContact { + + private val updatedEntries = listOf(entry(id = "addr-new", address = "0xnew", memo = "memo")) + + @Test + fun `GIVEN existing contact WHEN updateContact THEN preserves id AND restamps AND persists without uniqueness check`() = + runTest { + // Arrange + val existing = contact(name = "Alice") + val signatures = listOf(byteArrayOf(0x01, 0xAB.toByte())) + coEvery { signUseCase(hashes = any(), publicKey = any(), userWallet = eq(userWallet)) } returns + signatures.right() + val saved = slot() + coEvery { repository.saveContact(capture(saved)) } returns Unit + + // Act + val result = interactor.updateContact( + userWallet = userWallet, + contact = existing, + name = "Bob", + iconColor = "TestColor", + addressEntries = updatedEntries, + ) + + // Assert + val contact = result.getOrNull() + assertThat(contact).isEqualTo(saved.captured) + assertThat(contact!!.id).isEqualTo(existing.id) + assertThat(contact.name.value).isEqualTo("Bob") + assertThat(contact.createdAt).isEqualTo(ORIGINAL_TIMESTAMP) + assertThat(contact.updatedAt).isEqualTo(NEW_TIMESTAMP) + assertThat(contact.addressEntries.map { it.signature }) + .containsExactly(signatures[0].toHexString()) + coVerify(exactly = 0) { repository.getContacts(any()) } + } + + @Test + fun `GIVEN signUseCase fails WHEN updateContact THEN propagates Signing error without persisting`() = runTest { + // Arrange + coEvery { signUseCase(hashes = any(), publicKey = any(), userWallet = any()) } returns + SignHashesError.NoSigningKey.left() + + // Act + val result = interactor.updateContact( + userWallet = userWallet, + contact = contact(name = "Alice"), + name = "Bob", + iconColor = "TestColor", + addressEntries = updatedEntries, + ) + + // Assert + assertThat(result.leftOrNull()).isEqualTo(SaveContactError.Signing(SignHashesError.NoSigningKey)) + coVerify(exactly = 0) { repository.saveContact(any()) } + } + + @Test + fun `GIVEN blank name WHEN updateContact THEN Name Format without persisting`() = runTest { + // Act + val result = interactor.updateContact( + userWallet = userWallet, + contact = contact(name = "Alice"), + name = "", + iconColor = "TestColor", + addressEntries = updatedEntries, + ) + + // Assert + assertThat(result.leftOrNull()) + .isEqualTo(SaveContactError.Name(ContactNameValidationError.Format(ContactName.Error.Empty))) + coVerify(exactly = 0) { repository.saveContact(any()) } + } + } + + private fun contact(name: String): Contact = Contact( + id = ContactId("id-$name"), + walletId = userWallet.walletId, + name = requireNotNull(ContactName(name).getOrNull()), + icon = "", + iconColor = "TestColor", + createdAt = ORIGINAL_TIMESTAMP, + updatedAt = ORIGINAL_TIMESTAMP, + addressEntries = listOf(entry(id = "addr-$name", address = "0xabc", memo = null)), + ) + + private fun entry(id: String, address: String, memo: String?): AddressEntry = AddressEntry( + id = AddressEntryId(id), + address = address, + networkId = networkRawId, + memo = memo, + signature = "sig", + networkName = "Ethereum", + ) + + private fun expectedHash(contact: Contact, entry: AddressEntry): ByteArray { + val payload = entry.address + entry.networkId.value + entry.memo.orEmpty() + + contact.id.value + contact.name.value + return MessageDigest.getInstance("SHA-256").digest(payload.toByteArray(Charsets.UTF_8)) + } + + private companion object { + const val NEW_TIMESTAMP = "2026-06-10T14:30:00.000Z" + const val ORIGINAL_TIMESTAMP = "2026-01-01T00:00:00.000Z" + } +} \ No newline at end of file diff --git a/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/usecase/CreateContactUseCaseTest.kt b/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/usecase/CreateContactUseCaseTest.kt deleted file mode 100644 index c37c8c7d07..0000000000 --- a/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/usecase/CreateContactUseCaseTest.kt +++ /dev/null @@ -1,132 +0,0 @@ -package com.tangem.domain.addressbook.usecase - -import com.google.common.truth.Truth.assertThat -import com.tangem.domain.addressbook.error.ContactNameValidationError -import com.tangem.domain.addressbook.error.SaveContactError -import com.tangem.domain.addressbook.model.AddressEntry -import com.tangem.domain.addressbook.model.AddressEntryId -import com.tangem.domain.addressbook.model.Contact -import com.tangem.domain.addressbook.model.ContactId -import com.tangem.domain.addressbook.model.ContactName -import com.tangem.domain.addressbook.repository.AddressBookRepository -import com.tangem.domain.addressbook.time.IsoTimestampProvider -import com.tangem.domain.models.network.Network -import com.tangem.domain.models.wallet.UserWalletId -import io.mockk.clearMocks -import io.mockk.coEvery -import io.mockk.coVerify -import io.mockk.every -import io.mockk.mockk -import io.mockk.slot -import kotlinx.coroutines.flow.flowOf -import kotlinx.coroutines.test.runTest -import org.junit.jupiter.api.BeforeEach -import org.junit.jupiter.api.Test -import org.junit.jupiter.api.TestInstance - -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -class CreateContactUseCaseTest { - - private val repository: AddressBookRepository = mockk(relaxUnitFun = true) - private val expectedTimestamp = "2026-06-10T14:30:00.000Z" - private val timestampProvider: IsoTimestampProvider = mockk { - every { now() } returns expectedTimestamp - } - private val useCase = CreateContactUseCase( - repository = repository, - validateContactName = ValidateContactNameUseCase(repository), - timestampProvider = timestampProvider, - ) - - private val walletId = UserWalletId("011") - private val networkRawId = Network.RawID("ethereum") - private val networkId = Network.ID(value = "ethereum", derivationPath = Network.DerivationPath.None) - private val network: Network = mockk { every { id } returns networkId } - - private val addressEntries = listOf( - AddressEntry( - id = AddressEntryId("addr-1"), - address = "0xabc", - networkId = networkRawId, - memo = "memo", - signature = "sig", - ), - ) - - @BeforeEach - fun resetMocks() { - clearMocks(repository) - } - - @Test - fun `create generates ids and persists the contact`() = runTest { - every { repository.getContacts(walletId) } returns flowOf(emptyList()) - val saved = slot() - coEvery { repository.saveContact(capture(saved)) } returns Unit - - val result = useCase( - userWalletId = walletId, - name = "Alice", - network = network, - addressEntries = addressEntries, - ) - - val contact = result.getOrNull() - assertThat(contact).isEqualTo(saved.captured) - assertThat(contact!!.walletId).isEqualTo(walletId) - assertThat(contact.name.value).isEqualTo("Alice") - assertThat(contact.id.value).isNotEmpty() - assertThat(contact.addressEntries).isEqualTo(addressEntries) - assertThat(contact.createdAt).isEqualTo(expectedTimestamp) - assertThat(contact.updatedAt).isEqualTo(expectedTimestamp) - } - - @Test - fun `duplicate name fails without persisting`() = runTest { - every { repository.getContacts(walletId) } returns flowOf(listOf(contact(name = "Alice"))) - - val result = useCase( - userWalletId = walletId, - name = "alice", - network = network, - addressEntries = addressEntries, - ) - - assertThat(result.leftOrNull()) - .isEqualTo(SaveContactError.Name(ContactNameValidationError.Duplicate)) - coVerify(exactly = 0) { repository.saveContact(any()) } - } - - @Test - fun `invalid name fails without persisting`() = runTest { - every { repository.getContacts(walletId) } returns flowOf(emptyList()) - - val result = useCase( - userWalletId = walletId, - name = "", - network = network, - addressEntries = addressEntries, - ) - - assertThat(result.leftOrNull()) - .isEqualTo(SaveContactError.Name(ContactNameValidationError.Format(ContactName.Error.Empty))) - coVerify(exactly = 0) { repository.saveContact(any()) } - } - - private fun contact(name: String): Contact = Contact( - id = ContactId("id-$name"), - walletId = walletId, - name = requireNotNull(ContactName(name).getOrNull()), - createdAt = expectedTimestamp, - updatedAt = expectedTimestamp, - addressEntries = listOf( - AddressEntry( - id = AddressEntryId("addr-$name"), - address = "0xabc", - networkId = networkRawId, - memo = null, - signature = "sig", - ), - ), - ) -} \ No newline at end of file diff --git a/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/usecase/GetContactsUseCaseTest.kt b/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/usecase/GetContactsUseCaseTest.kt new file mode 100644 index 0000000000..21ce51f700 --- /dev/null +++ b/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/usecase/GetContactsUseCaseTest.kt @@ -0,0 +1,108 @@ +package com.tangem.domain.addressbook.usecase + +import com.google.common.truth.Truth.assertThat +import com.tangem.domain.addressbook.model.AddressEntry +import com.tangem.domain.addressbook.model.AddressEntryId +import com.tangem.domain.addressbook.model.Contact +import com.tangem.domain.addressbook.model.ContactId +import com.tangem.domain.addressbook.model.ContactName +import com.tangem.domain.addressbook.repository.AddressBookRepository +import com.tangem.domain.models.network.Network +import com.tangem.domain.models.wallet.UserWalletId +import io.mockk.clearMocks +import io.mockk.every +import io.mockk.mockk +import io.mockk.verify +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.flowOf +import kotlinx.coroutines.test.runTest +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.TestInstance + +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +class GetContactsUseCaseTest { + + private val repository: AddressBookRepository = mockk() + private val useCase = GetContactsUseCase(repository) + + private val alice = contact(name = "Alice", address = "0xaaa") + private val bob = contact(name = "Bob", address = "0xbbb") + + @BeforeEach + fun resetMocks() { + clearMocks(repository) + every { repository.getAllContacts() } returns flowOf(listOf(alice, bob)) + } + + @Test + fun `GIVEN query matches a name WHEN invoke THEN returns only matching contacts`() = runTest { + // Act + val result = useCase(query = "ali").first() + + // Assert + assertThat(result).containsExactly(alice) + } + + @Test + fun `GIVEN query matches an address WHEN invoke THEN returns only matching contacts`() = runTest { + // Act + val result = useCase(query = "0xbbb").first() + + // Assert + assertThat(result).containsExactly(bob) + } + + @Test + fun `GIVEN blank query WHEN invoke THEN returns all contacts unfiltered`() = runTest { + // Act + val result = useCase(query = " ").first() + + // Assert + assertThat(result).containsExactly(alice, bob) + } + + @Test + fun `GIVEN query matches nothing WHEN invoke THEN returns empty list`() = runTest { + // Act + val result = useCase(query = "charlie").first() + + // Assert + assertThat(result).isEmpty() + } + + @Test + fun `GIVEN userWalletId WHEN invoke THEN reads single wallet contacts AND not all contacts`() = runTest { + // Arrange + val walletId = UserWalletId("011") + every { repository.getContacts(walletId) } returns flowOf(listOf(alice)) + + // Act + val result = useCase(query = "", userWalletId = walletId).first() + + // Assert + assertThat(result).containsExactly(alice) + verify(exactly = 1) { repository.getContacts(walletId) } + verify(exactly = 0) { repository.getAllContacts() } + } + + private fun contact(name: String, address: String): Contact = Contact( + id = ContactId("id-$name"), + walletId = UserWalletId("011"), + name = requireNotNull(ContactName(name).getOrNull()), + icon = "", + iconColor = "KekColor", + createdAt = "2026-01-01T00:00:00.000Z", + updatedAt = "2026-01-01T00:00:00.000Z", + addressEntries = listOf( + AddressEntry( + id = AddressEntryId("addr-$name"), + address = address, + networkId = Network.RawID("ethereum"), + memo = null, + signature = "sig", + networkName = "Ethereum", + ), + ), + ) +} \ No newline at end of file diff --git a/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/usecase/SignAddressEntriesUseCaseTest.kt b/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/usecase/SignAddressEntriesUseCaseTest.kt deleted file mode 100644 index da7c887d62..0000000000 --- a/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/usecase/SignAddressEntriesUseCaseTest.kt +++ /dev/null @@ -1,145 +0,0 @@ -package com.tangem.domain.addressbook.usecase - -import arrow.core.left -import arrow.core.right -import com.google.common.truth.Truth.assertThat -import com.tangem.common.test.domain.wallet.MockUserWalletFactory -import com.tangem.domain.addressbook.model.AddressEntry -import com.tangem.domain.addressbook.model.AddressEntryId -import com.tangem.domain.addressbook.model.Contact -import com.tangem.domain.addressbook.model.ContactId -import com.tangem.domain.addressbook.model.ContactName -import com.tangem.domain.models.network.Network -import com.tangem.domain.models.wallet.UserWallet -import com.tangem.domain.models.wallet.UserWalletId -import com.tangem.domain.transaction.error.SignHashesError -import com.tangem.domain.transaction.usecase.SignUseCase -import com.tangem.utils.extensions.toHexString -import io.mockk.clearMocks -import io.mockk.coEvery -import io.mockk.coVerify -import io.mockk.every -import io.mockk.mockk -import io.mockk.slot -import kotlinx.coroutines.test.runTest -import org.junit.jupiter.api.BeforeEach -import org.junit.jupiter.api.Test -import org.junit.jupiter.api.TestInstance -import java.security.MessageDigest - -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -class SignAddressEntriesUseCaseTest { - - private val signUseCase: SignUseCase = mockk() - private val useCase = SignAddressEntriesUseCase(signUseCase = signUseCase) - - // The mock factory builds each wallet key with publicKey = curve.name bytes, so the secp256k1 key is "Secp256k1" - private val userWallet: UserWallet = MockUserWalletFactory.create() - private val secp256k1Key = "Secp256k1".toByteArray() - - @BeforeEach - fun resetMocks() { - clearMocks(signUseCase) - } - - @Test - fun `GIVEN contact with entries WHEN invoke THEN every entry receives its signature`() = runTest { - // Arrange - val contact = contact( - entry(id = "addr-1", address = "0xabc", memo = "memo"), - entry(id = "addr-2", address = "0xdef", memo = null), - ) - val signatures = listOf(byteArrayOf(0x01, 0xAB.toByte()), byteArrayOf(0xCD.toByte())) - val hashesSlot = slot>() - val publicKeySlot = slot() - coEvery { - signUseCase(hashes = capture(hashesSlot), publicKey = capture(publicKeySlot), userWallet = eq(userWallet)) - } returns signatures.right() - - // Act - val result = useCase(userWallet, contact) - - // Assert - // Signatures are applied in entry order, hex-encoded; all other fields are preserved - val expected = contact.copy( - addressEntries = listOf( - contact.addressEntries[0].copy(signature = signatures[0].toHexString()), - contact.addressEntries[1].copy(signature = signatures[1].toHexString()), - ), - ) - assertThat(result.getOrNull()).isEqualTo(expected) - // The wallet's primary secp256k1 key is the one signing - assertThat(publicKeySlot.captured).isEqualTo(secp256k1Key) - // Each entry is hashed as SHA-256(address + networkId + memo + contactId + name), in order - assertThat(hashesSlot.captured.map { it.toHexString() }) - .containsExactly( - expectedHash(contact, contact.addressEntries[0]).toHexString(), - expectedHash(contact, contact.addressEntries[1]).toHexString(), - ) - .inOrder() - } - - @Test - fun `GIVEN contact with no entries WHEN invoke THEN returns contact unchanged without signing`() = runTest { - // Arrange - val contact = contact() - - // Act - val result = useCase(userWallet, contact) - - // Assert - assertThat(result.getOrNull()).isEqualTo(contact) - coVerify(exactly = 0) { signUseCase(any>(), any(), any()) } - } - - @Test - fun `GIVEN wallet without a secp256k1 key WHEN invoke THEN returns NoSigningKey without signing`() = runTest { - // Arrange — a locked hot wallet exposes no key - val lockedWallet = mockk { every { wallets } returns null } - val contact = contact(entry(id = "addr-1", address = "0xabc", memo = null)) - - // Act - val result = useCase(lockedWallet, contact) - - // Assert - assertThat(result.leftOrNull()).isEqualTo(SignHashesError.NoSigningKey) - coVerify(exactly = 0) { signUseCase(any>(), any(), any()) } - } - - @Test - fun `GIVEN signUseCase returns error WHEN invoke THEN propagates the error`() = runTest { - // Arrange - val contact = contact(entry(id = "addr-1", address = "0xabc", memo = null)) - coEvery { signUseCase(any>(), any(), any()) } returns - SignHashesError.SigningFailed(message = "canceled").left() - - // Act - val result = useCase(userWallet, contact) - - // Assert - assertThat(result.leftOrNull()).isEqualTo(SignHashesError.SigningFailed(message = "canceled")) - } - - private fun contact(vararg entries: AddressEntry): Contact = Contact( - id = ContactId("contact-1"), - walletId = UserWalletId("011"), - name = requireNotNull(ContactName("Alice").getOrNull()), - createdAt = "2026-01-01T00:00:00.000Z", - updatedAt = "2026-01-01T00:00:00.000Z", - addressEntries = entries.toList(), - ) - - private fun entry(id: String, address: String, memo: String?): AddressEntry = AddressEntry( - id = AddressEntryId(id), - address = address, - networkId = Network.RawID("ethereum"), - memo = memo, - signature = "", - ) - - private fun expectedHash(contact: Contact, entry: AddressEntry): ByteArray { - val payload = entry.address + entry.networkId.value + entry.memo.orEmpty() + - contact.id.value + contact.name.value - return MessageDigest.getInstance("SHA-256").digest(payload.toByteArray(Charsets.UTF_8)) - } -} \ No newline at end of file diff --git a/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/usecase/UpdateContactUseCaseTest.kt b/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/usecase/UpdateContactUseCaseTest.kt deleted file mode 100644 index 043697d440..0000000000 --- a/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/usecase/UpdateContactUseCaseTest.kt +++ /dev/null @@ -1,109 +0,0 @@ -package com.tangem.domain.addressbook.usecase - -import com.google.common.truth.Truth.assertThat -import com.tangem.domain.addressbook.error.ContactNameValidationError -import com.tangem.domain.addressbook.error.SaveContactError -import com.tangem.domain.addressbook.model.AddressEntry -import com.tangem.domain.addressbook.model.AddressEntryId -import com.tangem.domain.addressbook.model.Contact -import com.tangem.domain.addressbook.model.ContactId -import com.tangem.domain.addressbook.model.ContactName -import com.tangem.domain.addressbook.repository.AddressBookRepository -import com.tangem.domain.addressbook.time.IsoTimestampProvider -import com.tangem.domain.models.network.Network -import com.tangem.domain.models.wallet.UserWalletId -import io.mockk.clearMocks -import io.mockk.coEvery -import io.mockk.coVerify -import io.mockk.every -import io.mockk.mockk -import io.mockk.slot -import kotlinx.coroutines.test.runTest -import org.junit.jupiter.api.BeforeEach -import org.junit.jupiter.api.Test -import org.junit.jupiter.api.TestInstance - -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -class UpdateContactUseCaseTest { - - private val repository: AddressBookRepository = mockk(relaxUnitFun = true) - private val newTimestamp = "2026-06-10T14:30:00.000Z" - private val originalTimestamp = "2026-01-01T00:00:00.000Z" - private val timestampProvider: IsoTimestampProvider = mockk { - every { now() } returns newTimestamp - } - private val useCase = UpdateContactUseCase( - repository = repository, - timestampProvider = timestampProvider, - ) - - private val walletId = UserWalletId("011") - private val networkRawId = Network.RawID("ethereum") - - private val updatedEntries = listOf( - AddressEntry( - id = AddressEntryId("addr-new"), - address = "0xnew", - networkId = networkRawId, - memo = "memo", - signature = "sig2", - ), - ) - - @BeforeEach - fun resetMocks() { - clearMocks(repository) - } - - @Test - fun `update preserves id and persists changes without checking uniqueness`() = runTest { - val existing = contact(name = "Alice") - val saved = slot() - coEvery { repository.saveContact(capture(saved)) } returns Unit - - val result = useCase( - contact = existing, - name = "Bob", - addressEntries = updatedEntries, - ) - - val contact = result.getOrNull() - assertThat(contact).isEqualTo(saved.captured) - assertThat(contact!!.id).isEqualTo(existing.id) - assertThat(contact.name.value).isEqualTo("Bob") - assertThat(contact.addressEntries).isEqualTo(updatedEntries) - assertThat(contact.createdAt).isEqualTo(originalTimestamp) // preserved - assertThat(contact.updatedAt).isEqualTo(newTimestamp) // restamped - coVerify(exactly = 0) { repository.getContacts(any()) } - } - - @Test - fun `invalid name fails without persisting`() = runTest { - val result = useCase( - contact = contact(name = "Alice"), - name = "", - addressEntries = updatedEntries, - ) - - assertThat(result.leftOrNull()) - .isEqualTo(SaveContactError.Name(ContactNameValidationError.Format(ContactName.Error.Empty))) - coVerify(exactly = 0) { repository.saveContact(any()) } - } - - private fun contact(name: String): Contact = Contact( - id = ContactId("id-$name"), - walletId = walletId, - name = requireNotNull(ContactName(name).getOrNull()), - createdAt = originalTimestamp, - updatedAt = originalTimestamp, - addressEntries = listOf( - AddressEntry( - id = AddressEntryId("addr-$name"), - address = "0xabc", - networkId = networkRawId, - memo = null, - signature = "sig", - ), - ), - ) -} \ No newline at end of file diff --git a/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/usecase/ValidateContactNameUseCaseTest.kt b/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/usecase/ValidateContactNameUseCaseTest.kt index aa81fcd4c1..bcc412f11e 100644 --- a/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/usecase/ValidateContactNameUseCaseTest.kt +++ b/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/usecase/ValidateContactNameUseCaseTest.kt @@ -64,6 +64,8 @@ class ValidateContactNameUseCaseTest { id = ContactId("id-$name"), walletId = walletId, name = requireNotNull(ContactName(name).getOrNull()), + icon = "", + iconColor = "KekColor", createdAt = "2026-01-01T00:00:00.000Z", updatedAt = "2026-01-01T00:00:00.000Z", addressEntries = listOf( @@ -73,6 +75,7 @@ class ValidateContactNameUseCaseTest { networkId = Network.RawID("ethereum"), memo = null, signature = "sig", + networkName = "Ethereum", ), ), ) diff --git a/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/usecase/VerifyAddressEntriesUseCaseTest.kt b/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/usecase/VerifyAddressEntriesUseCaseTest.kt deleted file mode 100644 index 858206d127..0000000000 --- a/domain/address-book/src/test/kotlin/com/tangem/domain/addressbook/usecase/VerifyAddressEntriesUseCaseTest.kt +++ /dev/null @@ -1,170 +0,0 @@ -package com.tangem.domain.addressbook.usecase - -import arrow.core.left -import arrow.core.right -import com.google.common.truth.Truth.assertThat -import com.tangem.domain.addressbook.model.AddressEntry -import com.tangem.domain.addressbook.model.AddressEntryId -import com.tangem.domain.addressbook.model.Contact -import com.tangem.domain.addressbook.model.ContactId -import com.tangem.domain.addressbook.model.ContactName -import com.tangem.domain.models.network.Network -import com.tangem.domain.models.wallet.UserWallet -import com.tangem.domain.models.wallet.UserWalletId -import com.tangem.domain.transaction.error.VerifyMessagesError -import com.tangem.domain.transaction.usecase.VerifySecp256k1MessagesUseCase -import com.tangem.utils.extensions.toHexString -import io.mockk.clearMocks -import io.mockk.every -import io.mockk.mockk -import io.mockk.slot -import io.mockk.verify -import org.junit.jupiter.api.BeforeEach -import org.junit.jupiter.api.Test -import org.junit.jupiter.api.TestInstance - -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -class VerifyAddressEntriesUseCaseTest { - - private val verifyMessagesUseCase: VerifySecp256k1MessagesUseCase = mockk() - private val useCase = VerifyAddressEntriesUseCase(verifyMessagesUseCase = verifyMessagesUseCase) - - private val userWallet: UserWallet = mockk() - - @BeforeEach - fun resetMocks() { - clearMocks(verifyMessagesUseCase) - } - - @Test - fun `GIVEN contact with entries WHEN invoke THEN verifies each entry payload and its signature`() { - // Arrange - val contact = contact( - entry(id = "addr-1", address = "0xabc", memo = "memo", signature = "AABB"), - entry(id = "addr-2", address = "0xdef", memo = null, signature = "CCDD"), - ) - val messagesSlot = slot>() - val signaturesSlot = slot>() - every { - verifyMessagesUseCase(eq(userWallet), capture(messagesSlot), capture(signaturesSlot)) - } returns listOf(true, true).right() - - // Act - val result = useCase(userWallet, contact) - - // Assert - // Each entry is verified against address + networkId + memo + contactId + name - assertThat(messagesSlot.captured.map { String(it) }) - .containsExactly( - expectedPayload(contact, contact.addressEntries[0]), - expectedPayload(contact, contact.addressEntries[1]), - ) - .inOrder() - // Hex signatures are decoded to bytes, in entry order - assertThat(signaturesSlot.captured.map { it.toHexString() }).containsExactly("AABB", "CCDD").inOrder() - } - - @Test - fun `GIVEN some entries fail verification WHEN invoke THEN partitions them preserving order`() { - // Arrange - val valid1 = entry(id = "addr-1", address = "0xabc", memo = null, signature = "AABB") - val invalid = entry(id = "addr-2", address = "0xdef", memo = null, signature = "CCDD") - val valid2 = entry(id = "addr-3", address = "0xghi", memo = null, signature = "EEFF") - val contact = contact(valid1, invalid, valid2) - every { verifyMessagesUseCase(any(), any(), any()) } returns listOf(true, false, true).right() - - // Act - val result = useCase(userWallet, contact).getOrNull() - - // Assert - assertThat(result!!.valid).containsExactly(valid1, valid2).inOrder() - assertThat(result.invalid).containsExactly(invalid) - assertThat(result.areAllInvalid).isFalse() - } - - @Test - fun `GIVEN malformed signature WHEN invoke THEN that entry is invalid and excluded from verification`() { - // Arrange - val malformed = entry(id = "addr-1", address = "0xabc", memo = null, signature = "not-hex") - val signed = entry(id = "addr-2", address = "0xdef", memo = null, signature = "AABB") - val contact = contact(malformed, signed) - val signaturesSlot = slot>() - every { - verifyMessagesUseCase(eq(userWallet), any(), capture(signaturesSlot)) - } returns listOf(true).right() - - // Act - val result = useCase(userWallet, contact).getOrNull() - - // Assert - // Only the well-formed entry is passed to verification - assertThat(signaturesSlot.captured.map { it.toHexString() }).containsExactly("AABB") - assertThat(result!!.valid).containsExactly(signed) - assertThat(result.invalid).containsExactly(malformed) - } - - @Test - fun `GIVEN every entry is invalid WHEN invoke THEN allInvalid is true`() { - // Arrange - val entry1 = entry(id = "addr-1", address = "0xabc", memo = null, signature = "AABB") - val entry2 = entry(id = "addr-2", address = "0xdef", memo = null, signature = "CCDD") - val contact = contact(entry1, entry2) - every { verifyMessagesUseCase(any(), any(), any()) } returns listOf(false, false).right() - - // Act - val result = useCase(userWallet, contact).getOrNull() - - // Assert - assertThat(result!!.valid).isEmpty() - assertThat(result.invalid).containsExactly(entry1, entry2).inOrder() - assertThat(result.areAllInvalid).isTrue() - } - - @Test - fun `GIVEN contact with no entries WHEN invoke THEN returns empty partition without verifying`() { - // Arrange - val contact = contact() - - // Act - val result = useCase(userWallet, contact).getOrNull() - - // Assert - assertThat(result!!.valid).isEmpty() - assertThat(result.invalid).isEmpty() - assertThat(result.areAllInvalid).isFalse() - verify(exactly = 0) { verifyMessagesUseCase(any(), any(), any()) } - } - - @Test - fun `GIVEN verifyMessagesUseCase returns error WHEN invoke THEN propagates the error`() { - // Arrange - val contact = contact(entry(id = "addr-1", address = "0xabc", memo = null, signature = "AABB")) - every { verifyMessagesUseCase(any(), any(), any()) } returns VerifyMessagesError.NoSigningKey.left() - - // Act - val result = useCase(userWallet, contact) - - // Assert - assertThat(result.leftOrNull()).isEqualTo(VerifyMessagesError.NoSigningKey) - } - - private fun contact(vararg entries: AddressEntry): Contact = Contact( - id = ContactId("contact-1"), - walletId = UserWalletId("011"), - name = requireNotNull(ContactName("Alice").getOrNull()), - createdAt = "2026-01-01T00:00:00.000Z", - updatedAt = "2026-01-01T00:00:00.000Z", - addressEntries = entries.toList(), - ) - - private fun entry(id: String, address: String, memo: String?, signature: String): AddressEntry = AddressEntry( - id = AddressEntryId(id), - address = address, - networkId = Network.RawID("ethereum"), - memo = memo, - signature = signature, - ) - - private fun expectedPayload(contact: Contact, entry: AddressEntry): String = - entry.address + entry.networkId.value + entry.memo.orEmpty() + contact.id.value + contact.name.value -} \ No newline at end of file diff --git a/domain/express/models/build.gradle.kts b/domain/express/models/build.gradle.kts index 22efcd57bd..0ebcc0b441 100644 --- a/domain/express/models/build.gradle.kts +++ b/domain/express/models/build.gradle.kts @@ -7,5 +7,7 @@ plugins { dependencies { implementation(deps.moshi.adapters) implementation(deps.kotlin.serialization) + implementation(projects.domain.models) implementation(projects.domain.tokens.models) + implementation(projects.domain.onramp.models) } \ No newline at end of file diff --git a/domain/express/models/src/main/java/com/tangem/domain/express/models/ExpressTransactionAsset.kt b/domain/express/models/src/main/java/com/tangem/domain/express/models/ExpressTransactionAsset.kt index 954db1d1c6..402263b84f 100644 --- a/domain/express/models/src/main/java/com/tangem/domain/express/models/ExpressTransactionAsset.kt +++ b/domain/express/models/src/main/java/com/tangem/domain/express/models/ExpressTransactionAsset.kt @@ -1,16 +1,20 @@ package com.tangem.domain.express.models +import com.tangem.domain.models.currency.CryptoCurrency import java.math.BigDecimal /** * A crypto asset leg of an express operation: which asset and how much of it moved. * * @property id The asset identifier (network id + contract address). - * @property amount Human-readable amount (already scaled by [decimals]). + * @property amount Human-readable amount (already scaled by [decimals]); `null` when the backend provided no amount. * @property decimals The asset's decimals. + * @property cryptoCurrency The portfolio [CryptoCurrency] this asset was resolved to (matched by network id + + * contract address across all accounts). `null` when no portfolio currency matched and no fallback could be built. */ data class ExpressTransactionAsset( val id: ExpressAsset.ID, - val amount: BigDecimal, + val amount: BigDecimal?, val decimals: Int, + val cryptoCurrency: CryptoCurrency? = null, ) \ No newline at end of file diff --git a/domain/express/models/src/main/java/com/tangem/domain/express/models/OnrampTransaction.kt b/domain/express/models/src/main/java/com/tangem/domain/express/models/OnrampTransaction.kt index 4940b3d055..e6388dee75 100644 --- a/domain/express/models/src/main/java/com/tangem/domain/express/models/OnrampTransaction.kt +++ b/domain/express/models/src/main/java/com/tangem/domain/express/models/OnrampTransaction.kt @@ -1,5 +1,6 @@ package com.tangem.domain.express.models +import com.tangem.domain.onramp.model.OnrampCountry import com.tangem.domain.tokens.model.Amount import com.tangem.domain.tokens.model.AmountType @@ -15,6 +16,7 @@ import com.tangem.domain.tokens.model.AmountType * @property payoutHash On-chain hash of the payout (received) leg, if known. * @property fromFiat The fiat paid. * @property toAsset The crypto asset received. + * @property country The country the onramp was made from; `null` if not resolved. */ data class OnrampTransaction( val txId: String, @@ -25,4 +27,5 @@ data class OnrampTransaction( /** The [Amount.type] is [AmountType.FiatType] . */ val fromFiat: Amount, val toAsset: ExpressTransactionAsset, + val country: OnrampCountry? = null, ) \ No newline at end of file diff --git a/domain/models/src/main/kotlin/com/tangem/domain/models/network/SdkAmount.kt b/domain/models/src/main/kotlin/com/tangem/domain/models/network/SdkAmount.kt new file mode 100644 index 0000000000..4f2bb40fab --- /dev/null +++ b/domain/models/src/main/kotlin/com/tangem/domain/models/network/SdkAmount.kt @@ -0,0 +1,50 @@ +package com.tangem.domain.models.network + +import com.tangem.domain.models.serialization.SerializedBigDecimal +import kotlinx.serialization.Serializable + +/** + * Domain mirror of the blockchain SDK `Amount`, kept [Serializable] so it can be carried inside the serializable + * [TxInfo] graph (the SDK `Amount` is not serializable and pulls in blockchain-specific types). + * + * Holds a monetary value together with the metadata needed to display it. Compared to the SDK model it drops + * `maxValue` (irrelevant outside of "send" flows) and keeps only the currency identity on [SdkAmountType]. + * + * @property currencySymbol display symbol of the currency (e.g. `ETH`, `USDT`) + * @property value amount value; `null` when the value is unknown + * @property decimals number of decimals of the currency + * @property type kind of currency the amount is denominated in + */ +@Serializable +data class SdkAmount( + val currencySymbol: String, + val value: SerializedBigDecimal? = null, + val decimals: Int, + val type: SdkAmountType = SdkAmountType.Coin, +) + +/** Kind of currency an [SdkAmount] is denominated in. Mirrors the SDK `AmountType`. */ +@Serializable +sealed interface SdkAmountType { + + /** Native coin of the blockchain. */ + @Serializable + data object Coin : SdkAmountType + + /** Native coin used as a reserve currency for fee calculation (e.g. Algorand). */ + @Serializable + data object Reserve : SdkAmountType + + /** A resource that can be spent to pay the fee (e.g. Mana on Koinos). */ + @Serializable + data class FeeResource(val name: String? = null) : SdkAmountType + + /** + * A token of the blockchain. + * + * @property contractAddress token contract address + * @property id backend currency id, when known + */ + @Serializable + data class Token(val contractAddress: String, val id: String? = null) : SdkAmountType +} \ No newline at end of file diff --git a/domain/models/src/main/kotlin/com/tangem/domain/models/network/TxInfo.kt b/domain/models/src/main/kotlin/com/tangem/domain/models/network/TxInfo.kt index 2e0c0b37b7..83e0036176 100644 --- a/domain/models/src/main/kotlin/com/tangem/domain/models/network/TxInfo.kt +++ b/domain/models/src/main/kotlin/com/tangem/domain/models/network/TxInfo.kt @@ -15,6 +15,7 @@ import kotlinx.serialization.Serializable * @property status transaction status * @property type transaction type * @property amount transaction amount + * @property fee transaction fee */ @Serializable data class TxInfo( @@ -27,6 +28,7 @@ data class TxInfo( val status: TransactionStatus, val type: TransactionType, val amount: SerializedBigDecimal, + val fee: SdkAmount? = null, ) { /** Destination type*/ diff --git a/domain/push-notification-preferences/src/main/kotlin/com/tangem/domain/pushnotificationpreferences/models/PushNotificationPreference.kt b/domain/push-notification-preferences/src/main/kotlin/com/tangem/domain/pushnotificationpreferences/models/PushNotificationPreference.kt index 248d916d41..d5642bf159 100644 --- a/domain/push-notification-preferences/src/main/kotlin/com/tangem/domain/pushnotificationpreferences/models/PushNotificationPreference.kt +++ b/domain/push-notification-preferences/src/main/kotlin/com/tangem/domain/pushnotificationpreferences/models/PushNotificationPreference.kt @@ -2,5 +2,4 @@ package com.tangem.domain.pushnotificationpreferences.models data class PushNotificationPreference( val isEnabled: Boolean, - val isVisible: Boolean, ) \ No newline at end of file diff --git a/domain/transaction/src/main/java/com/tangem/domain/transaction/usecase/gasless/CreateAndSendGaslessTransactionUseCase.kt b/domain/transaction/src/main/java/com/tangem/domain/transaction/usecase/gasless/CreateAndSendGaslessTransactionUseCase.kt index 5fe647247b..d307e498ab 100644 --- a/domain/transaction/src/main/java/com/tangem/domain/transaction/usecase/gasless/CreateAndSendGaslessTransactionUseCase.kt +++ b/domain/transaction/src/main/java/com/tangem/domain/transaction/usecase/gasless/CreateAndSendGaslessTransactionUseCase.kt @@ -295,7 +295,7 @@ class CreateAndSendGaslessTransactionUseCase( private suspend fun getEIP7702DataForGasless( gaslessDataProvider: EthereumGaslessDataProvider, ): EIP7702AuthorizationData { - return when (val dataResult = gaslessDataProvider.prepareEIP7702AuthorizationData()) { + return when (val dataResult = gaslessDataProvider.prepareEIP7702AuthorizationData(isV2 = false)) { is Result.Failure -> throw dataResult.error is Result.Success -> dataResult.data } diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/models/GetUserWalletError.kt b/domain/wallets/models/src/main/java/com/tangem/domain/wallets/models/errors/GetUserWalletError.kt similarity index 66% rename from domain/wallets/src/main/java/com/tangem/domain/wallets/models/GetUserWalletError.kt rename to domain/wallets/models/src/main/java/com/tangem/domain/wallets/models/errors/GetUserWalletError.kt index 3e7e62a562..745399666a 100644 --- a/domain/wallets/src/main/java/com/tangem/domain/wallets/models/GetUserWalletError.kt +++ b/domain/wallets/models/src/main/java/com/tangem/domain/wallets/models/errors/GetUserWalletError.kt @@ -1,4 +1,4 @@ -package com.tangem.domain.wallets.models +package com.tangem.domain.wallets.models.errors sealed class GetUserWalletError { diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletSyncUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletSyncUseCase.kt index 071bc36c87..754a063118 100644 --- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletSyncUseCase.kt +++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletSyncUseCase.kt @@ -4,7 +4,7 @@ import arrow.core.Either import arrow.core.raise.either import com.tangem.domain.common.wallets.UserWalletsListRepository import com.tangem.domain.models.wallet.UserWallet -import com.tangem.domain.wallets.models.GetUserWalletError +import com.tangem.domain.wallets.models.errors.GetUserWalletError /** * Use case for getting selected wallet. diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletUseCase.kt index 19a253810c..30e17a1483 100644 --- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletUseCase.kt +++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletUseCase.kt @@ -4,7 +4,7 @@ import arrow.core.Either import arrow.core.raise.either import com.tangem.domain.common.wallets.UserWalletsListRepository import com.tangem.domain.models.wallet.UserWallet -import com.tangem.domain.wallets.models.GetUserWalletError +import com.tangem.domain.wallets.models.errors.GetUserWalletError import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filterNotNull diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetUserWalletUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetUserWalletUseCase.kt index 577f7d8b93..14c5077096 100644 --- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetUserWalletUseCase.kt +++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetUserWalletUseCase.kt @@ -10,7 +10,7 @@ import com.tangem.domain.common.wallets.requireUserWalletsSync import com.tangem.domain.core.utils.EitherFlow import com.tangem.domain.models.wallet.UserWallet import com.tangem.domain.models.wallet.UserWalletId -import com.tangem.domain.wallets.models.GetUserWalletError +import com.tangem.domain.wallets.models.errors.GetUserWalletError import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.transformLatest diff --git a/features/address-book/api/build.gradle.kts b/features/address-book/api/build.gradle.kts index 425593dae2..b70fe75e59 100644 --- a/features/address-book/api/build.gradle.kts +++ b/features/address-book/api/build.gradle.kts @@ -10,6 +10,10 @@ android { dependencies { + /* Project - Common */ + api(projects.common.routing) + implementation(projects.common.ui) + /* Project - Domain */ implementation(projects.domain.models) @@ -19,4 +23,7 @@ dependencies { /* Compose */ implementation(deps.compose.runtime) + + /** Other */ + implementation(deps.kotlin.immutable.collections) } \ No newline at end of file diff --git a/features/address-book/api/src/main/kotlin/com/tangem/features/addressbook/AddressBookComponent.kt b/features/address-book/api/src/main/kotlin/com/tangem/features/addressbook/AddressBookComponent.kt index e9fe9ddb22..ff7f36e511 100644 --- a/features/address-book/api/src/main/kotlin/com/tangem/features/addressbook/AddressBookComponent.kt +++ b/features/address-book/api/src/main/kotlin/com/tangem/features/addressbook/AddressBookComponent.kt @@ -1,5 +1,6 @@ package com.tangem.features.addressbook +import com.tangem.common.routing.entity.AddressBookOpenMode import com.tangem.core.decompose.factory.ComponentFactory import com.tangem.core.ui.decompose.ComposableContentComponent @@ -7,5 +8,5 @@ interface AddressBookComponent : ComposableContentComponent { interface Factory : ComponentFactory - data class Params(val predefinedAddress: String?) + data class Params(val addressBookOpenMode: AddressBookOpenMode) } \ No newline at end of file diff --git a/features/address-book/api/src/main/kotlin/com/tangem/features/addressbook/AddressBookContactsBlockComponent.kt b/features/address-book/api/src/main/kotlin/com/tangem/features/addressbook/AddressBookContactsBlockComponent.kt new file mode 100644 index 0000000000..7c8f04d753 --- /dev/null +++ b/features/address-book/api/src/main/kotlin/com/tangem/features/addressbook/AddressBookContactsBlockComponent.kt @@ -0,0 +1,33 @@ +package com.tangem.features.addressbook + +import com.tangem.core.decompose.factory.ComponentFactory +import com.tangem.core.ui.decompose.ComposableContentComponent +import com.tangem.domain.models.network.Network +import com.tangem.domain.models.wallet.UserWalletId +import kotlinx.coroutines.flow.StateFlow + +/** + * The contacts block shown on the Send address-entry screen, below the "recent" block. Lists up to five contacts that + * have an address in [Params.network], filtered live by [Params.queryFlow] (the recipient-input text, matched against + * contact name or address). Hidden when there are no matching contacts. + */ +interface AddressBookContactsBlockComponent : ComposableContentComponent { + + interface Factory : ComponentFactory + + /** + * @property userWalletId the sending wallet whose address book is shown + * @property network the current send network; only contacts with an address in this network are shown + * @property queryFlow the live recipient-input text used to filter the block + * @property onContactClick invoked with the tapped contact and its network-matching entries; the host decides + * whether to apply it directly (single entry) or open the address selector (multiple entries) + * @property onSeeAllClick invoked when the user taps "See all" to open the full address book in selection mode + */ + data class Params( + val userWalletId: UserWalletId, + val network: Network, + val queryFlow: StateFlow, + val onContactClick: (MatchedContact) -> Unit, + val onSeeAllClick: () -> Unit, + ) +} \ No newline at end of file diff --git a/features/address-book/api/src/main/kotlin/com/tangem/features/addressbook/AddressSelectorComponent.kt b/features/address-book/api/src/main/kotlin/com/tangem/features/addressbook/AddressSelectorComponent.kt new file mode 100644 index 0000000000..4f0eb88c45 --- /dev/null +++ b/features/address-book/api/src/main/kotlin/com/tangem/features/addressbook/AddressSelectorComponent.kt @@ -0,0 +1,19 @@ +package com.tangem.features.addressbook + +import com.tangem.core.decompose.factory.ComponentFactory +import com.tangem.core.ui.decompose.ComposableBottomSheetComponent + +/** + * Bottom sheet shown when a picked contact has more than one address in the target network. Lets the user choose a + * concrete address; the chosen one is returned via [Params.onAddressSelected] as a [SelectedContact]. + */ +interface AddressSelectorComponent : ComposableBottomSheetComponent { + + interface Factory : ComponentFactory + + data class Params( + val contact: MatchedContact, + val onAddressSelected: (SelectedContact) -> Unit, + val onDismiss: () -> Unit, + ) +} \ No newline at end of file diff --git a/features/address-book/api/src/main/kotlin/com/tangem/features/addressbook/ContactSelectionTrigger.kt b/features/address-book/api/src/main/kotlin/com/tangem/features/addressbook/ContactSelectionTrigger.kt new file mode 100644 index 0000000000..b11d5dedad --- /dev/null +++ b/features/address-book/api/src/main/kotlin/com/tangem/features/addressbook/ContactSelectionTrigger.kt @@ -0,0 +1,20 @@ +package com.tangem.features.addressbook + +import kotlinx.coroutines.flow.SharedFlow + +/** + * Delivers a contact picked in the full address-book list (opened in selection mode) back to whatever feature + * requested the selection. The picker and the requesting feature live in independent model scopes, so a one-shot + * [SharedFlow] is used instead of a retained holder: nothing is kept after emission, so there is nothing to clear. + * + * Mirrors the `SwapChooseTokenNetworkTrigger`/`Listener` pattern. + */ +interface ContactSelectionTrigger { + + fun trigger(contact: SelectedContact) +} + +interface ContactSelectionListener { + + val resultFlow: SharedFlow +} \ No newline at end of file diff --git a/features/address-book/api/src/main/kotlin/com/tangem/features/addressbook/MatchedContact.kt b/features/address-book/api/src/main/kotlin/com/tangem/features/addressbook/MatchedContact.kt new file mode 100644 index 0000000000..f5d9b0adff --- /dev/null +++ b/features/address-book/api/src/main/kotlin/com/tangem/features/addressbook/MatchedContact.kt @@ -0,0 +1,37 @@ +package com.tangem.features.addressbook + +import com.tangem.common.ui.account.AccountIconUM +import kotlinx.collections.immutable.ImmutableList + +/** + * A contact together with its address entries that match a given network. Emitted when a contact is tapped during + * selection; the host decides what to do with it: + * - exactly one [entries] item → build a [SelectedContact] and proceed straight away; + * - more than one → open the address selector so the user picks a concrete address first. + */ + +data class MatchedContact( + val contactId: String, + val name: String, + val icon: AccountIconUM.CryptoPortfolio, + val networkId: String, + val entries: ImmutableList, +) { + + /** Resolves this contact to a concrete pick using one of its [entries]. */ + fun toSelectedContact(entry: ContactAddress): SelectedContact = SelectedContact( + contactId = contactId, + name = name, + icon = icon, + address = entry.address, + networkId = networkId, + memo = entry.memo, + ) + + /** A single network-matching address of the contact. */ + data class ContactAddress( + val address: String, + val memo: String?, + val networkName: String, + ) +} \ No newline at end of file diff --git a/features/address-book/api/src/main/kotlin/com/tangem/features/addressbook/SelectedContact.kt b/features/address-book/api/src/main/kotlin/com/tangem/features/addressbook/SelectedContact.kt new file mode 100644 index 0000000000..36e8e8cd74 --- /dev/null +++ b/features/address-book/api/src/main/kotlin/com/tangem/features/addressbook/SelectedContact.kt @@ -0,0 +1,25 @@ +package com.tangem.features.addressbook + +import com.tangem.common.ui.account.AccountIconUM + +/** + * A single resolved address-book pick. Produced once the concrete address within a contact is known — either directly + * (the contact has a single matching-network address) or after the user chose one in the address selector. + * + * Feature-agnostic: any feature that opens the address book for selection receives this result. + * + * @property contactId the id of the source [com.tangem.domain.addressbook.model.Contact] + * @property name the contact name to display + * @property icon the contact avatar (initials + color), reusing the account icon UI model + * @property address the chosen on-chain address + * @property networkId raw id of the network the address belongs to + * @property memo optional memo/destination tag (only meaningful for networks that support it) + */ +data class SelectedContact( + val contactId: String, + val name: String, + val icon: AccountIconUM.CryptoPortfolio, + val address: String, + val networkId: String, + val memo: String?, +) \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/AddAddressComponent.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/AddAddressComponent.kt deleted file mode 100644 index 445dfa6c4a..0000000000 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/AddAddressComponent.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.tangem.features.addressbook.addaddress - -import com.tangem.core.decompose.factory.ComponentFactory -import com.tangem.core.ui.decompose.ComposableContentComponent -import com.tangem.features.addressbook.editcontact.contract.ValidatedAddress - -internal interface AddAddressComponent : ComposableContentComponent { - - interface Factory : ComponentFactory - - data class Params( - val onBackClick: () -> Unit, - val onConfirm: (ValidatedAddress) -> Unit, - ) -} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/DefaultAddAddressComponent.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/DefaultAddAddressComponent.kt index 374e522918..62d3e586a8 100644 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/DefaultAddAddressComponent.kt +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/DefaultAddAddressComponent.kt @@ -7,16 +7,15 @@ import androidx.compose.ui.Modifier import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.decompose.model.getOrCreateModel +import com.tangem.core.ui.decompose.ComposableContentComponent import com.tangem.features.addressbook.addaddress.model.AddAddressModel import com.tangem.features.addressbook.addaddress.ui.AddAddressContent -import dagger.assisted.Assisted -import dagger.assisted.AssistedFactory -import dagger.assisted.AssistedInject +import com.tangem.features.addressbook.editcontact.ui.state.ValidatedAddress -internal class DefaultAddAddressComponent @AssistedInject constructor( - @Assisted context: AppComponentContext, - @Assisted params: AddAddressComponent.Params, -) : AddAddressComponent, AppComponentContext by context { +internal class DefaultAddAddressComponent( + appComponentContext: AppComponentContext, + params: Params, +) : ComposableContentComponent, AppComponentContext by appComponentContext { private val model: AddAddressModel = getOrCreateModel(params) @@ -30,11 +29,8 @@ internal class DefaultAddAddressComponent @AssistedInject constructor( BackHandler(onBack = state.onBackClick) } - @AssistedFactory - interface Factory : AddAddressComponent.Factory { - override fun create( - context: AppComponentContext, - params: AddAddressComponent.Params, - ): DefaultAddAddressComponent - } + data class Params( + val onBackClick: () -> Unit, + val onConfirm: (ValidatedAddress) -> Unit, + ) } \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/model/AddAddressModel.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/model/AddAddressModel.kt index c5ca0ebc21..925354b0d5 100644 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/model/AddAddressModel.kt +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/model/AddAddressModel.kt @@ -1,30 +1,21 @@ package com.tangem.features.addressbook.addaddress.model -import com.tangem.blockchainsdk.utils.toBlockchain -import com.tangem.common.ui.extensions.iconResId import com.tangem.core.decompose.di.ModelScoped import com.tangem.core.decompose.model.Model import com.tangem.core.decompose.model.ParamsContainer -import com.tangem.core.ui.R import com.tangem.core.ui.clipboard.ClipboardManager -import com.tangem.core.ui.ds.button.TangemButtonType -import com.tangem.core.ui.ds.button.TangemButtonUM -import com.tangem.core.ui.extensions.TextReference -import com.tangem.core.ui.extensions.resourceReference import com.tangem.domain.account.supplier.MultiAccountListSupplier import com.tangem.domain.models.currency.CryptoCurrency -import com.tangem.domain.models.network.Network -import com.tangem.features.addressbook.addaddress.AddAddressComponent -import com.tangem.features.addressbook.addaddress.contract.AddAddressUM -import com.tangem.features.addressbook.addaddress.contract.AddressFieldUM +import com.tangem.features.addressbook.addaddress.DefaultAddAddressComponent +import com.tangem.features.addressbook.addaddress.state.AddAddressStateController +import com.tangem.features.addressbook.addaddress.state.transformers.UpdateAddAddressInitialStateTransformer +import com.tangem.features.addressbook.addaddress.state.transformers.UpdateAddressInputTransformer +import com.tangem.features.addressbook.addaddress.state.transformers.UpdateAddressValidationTransformer +import com.tangem.features.addressbook.addaddress.ui.state.AddAddressUM import com.tangem.utils.coroutines.CoroutineDispatcherProvider -import kotlinx.collections.immutable.ImmutableList -import kotlinx.collections.immutable.persistentListOf -import kotlinx.collections.immutable.toImmutableList import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.flow.* import javax.inject.Inject -import kotlin.collections.map @OptIn(FlowPreview::class) @ModelScoped @@ -33,12 +24,12 @@ internal class AddAddressModel @Inject constructor( override val dispatchers: CoroutineDispatcherProvider, multiAccountListSupplier: MultiAccountListSupplier, private val clipboardManager: ClipboardManager, + private val stateController: AddAddressStateController, ) : Model() { - private val params: AddAddressComponent.Params = paramsContainer.require() + private val params: DefaultAddAddressComponent.Params = paramsContainer.require() - val state: StateFlow - field = MutableStateFlow(getInitialState()) + val state: StateFlow get() = stateController.uiState private val availableCoins: StateFlow> = multiAccountListSupplier() .map { accountLists -> @@ -47,6 +38,7 @@ internal class AddAddressModel @Inject constructor( .filterIsInstance() .distinctBy { it.network.id } } + .flowOn(dispatchers.default) .stateIn(modelScope, SharingStarted.Eagerly, emptyList()) private val addressInput = state @@ -55,94 +47,44 @@ internal class AddAddressModel @Inject constructor( .debounce(ADD_ADDRESS_DEBOUNCE) init { - subscribeToAddressInput() + updateInitialState() + subscribeToAddressValidation() } - private fun onAddressChange(value: String, isPasted: Boolean = false) { - state.update { oldState -> - oldState.copy( - addressField = oldState.addressField.copy( - value = value, - isValuePasted = isPasted, - isError = false, - error = null, - ), - chosenNetworkStateUM = AddAddressUM.ChosenNetworkStateUM.Loading, - ) - } + private fun updateInitialState() { + stateController.update( + UpdateAddAddressInitialStateTransformer( + onAddressChange = { onAddressChange(value = it) }, + onAddressClear = { onAddressChange("") }, + onPasteClick = ::onPaste, + onQrClick = { /* [REDACTED_TODO_COMMENT] */ }, + onBackClick = params.onBackClick, + onConfirmClick = ::validateAndConfirm, + ), + ) } - private fun subscribeToAddressInput() { + private fun onAddressChange(value: String) { + stateController.update(UpdateAddressInputTransformer(value = value)) + } + + private fun subscribeToAddressValidation() { combine(addressInput, availableCoins) { input, coins -> - getUniqueNetworks(input, coins) + UpdateAddressValidationTransformer(address = input, coins = coins) } - .onEach { availableNetworks -> - state.update { oldState -> - oldState.copy( - availableNetworks = availableNetworks, - chosenNetworkStateUM = createChosenNetworkState(availableNetworks), - ) - } - } + .onEach(stateController::update) + .flowOn(dispatchers.default) .launchIn(modelScope) } - private fun createChosenNetworkState(availableNetworks: ImmutableList): AddAddressUM.ChosenNetworkStateUM { - return if (availableNetworks.isEmpty()) { - AddAddressUM.ChosenNetworkStateUM.Empty - } else { - AddAddressUM.ChosenNetworkStateUM.Result( - networkUMList = availableNetworks - .map { network -> - AddAddressUM.ChosenNetworkStateUM.Result.NetworkUM( - networkName = network.name, - iconResId = network.iconResId, - ) - } - .toImmutableList(), - ) - } - } - - private fun getUniqueNetworks(input: String, coins: List): ImmutableList { - return coins - .filter { it.network.toBlockchain().validateAddress(input) } - .map { it.network } - .toImmutableList() - } - private fun onPaste() { - onAddressChange(value = clipboardManager.getText().orEmpty(), isPasted = true) + onAddressChange(value = clipboardManager.getText().orEmpty()) } private fun validateAndConfirm() { - // TODO([REDACTED_TASK_KEY]): validate the address and invoke params.onConfirm + // TODO Address book ([REDACTED_TASK_KEY]): navigate to the network-selection with the address and its matching networks. } - private fun getInitialState(): AddAddressUM = AddAddressUM( - addressField = AddressFieldUM( - value = "", - placeholder = resourceReference(R.string.common_address), - label = resourceReference(R.string.address_book_enter_address), - isError = false, - error = null, - isValuePasted = false, - ), - availableNetworks = persistentListOf(), - buttonUM = TangemButtonUM( - text = TextReference.Res(R.string.address_book_add_address), - type = TangemButtonType.Primary, - isEnabled = false, - onClick = ::validateAndConfirm, - ), - chosenNetworkStateUM = AddAddressUM.ChosenNetworkStateUM.Empty, - onAddressChange = { onAddressChange(value = it) }, - onAddressClear = { onAddressChange("") }, - onPasteClick = ::onPaste, - onQrClick = { /* [REDACTED_TODO_COMMENT] */ }, - onBackClick = params.onBackClick, - ) - companion object { private const val ADD_ADDRESS_DEBOUNCE = 500L } diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/state/AddAddressStateController.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/state/AddAddressStateController.kt new file mode 100644 index 0000000000..b0f71b411c --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/state/AddAddressStateController.kt @@ -0,0 +1,48 @@ +package com.tangem.features.addressbook.addaddress.state + +import com.tangem.core.decompose.di.ModelScoped +import com.tangem.core.ui.R +import com.tangem.core.ui.ds.button.TangemButtonType +import com.tangem.core.ui.ds.button.TangemButtonUM +import com.tangem.core.ui.extensions.TextReference +import com.tangem.core.ui.extensions.resourceReference +import com.tangem.features.addressbook.addaddress.ui.state.AddAddressUM +import com.tangem.features.addressbook.addaddress.ui.state.AddressFieldUM +import com.tangem.utils.transformer.Transformer +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.update +import javax.inject.Inject + +@ModelScoped +internal class AddAddressStateController @Inject constructor() { + + val uiState: StateFlow + field = MutableStateFlow(value = getInitialState()) + + fun update(transformer: Transformer) { + uiState.update(function = transformer::transform) + } + + private fun getInitialState(): AddAddressUM = AddAddressUM( + addressField = AddressFieldUM( + value = "", + placeholder = resourceReference(R.string.address_book_enter_address), + label = resourceReference(R.string.common_address), + isError = false, + ), + buttonUM = TangemButtonUM( + text = TextReference.Res(R.string.address_book_add_address), + type = TangemButtonType.Primary, + isEnabled = false, + onClick = {}, + ), + chosenNetworkStateUM = AddAddressUM.ChosenNetworkStateUM.Empty, + onAddressChange = {}, + onAddressClear = {}, + onPasteClick = {}, + onQrClick = {}, + onBackClick = {}, + onNetworkClick = {}, + ) +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/state/transformers/UpdateAddAddressInitialStateTransformer.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/state/transformers/UpdateAddAddressInitialStateTransformer.kt new file mode 100644 index 0000000000..15007b6655 --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/state/transformers/UpdateAddAddressInitialStateTransformer.kt @@ -0,0 +1,29 @@ +package com.tangem.features.addressbook.addaddress.state.transformers + +import com.tangem.features.addressbook.addaddress.ui.state.AddAddressUM +import com.tangem.utils.transformer.Transformer + +/** + * Wires the callbacks owned by [com.tangem.features.addressbook.addaddress.model.AddAddressModel] into the initial + * state produced by [com.tangem.features.addressbook.addaddress.state.AddAddressStateController]. + */ +internal class UpdateAddAddressInitialStateTransformer( + private val onAddressChange: (String) -> Unit, + private val onAddressClear: () -> Unit, + private val onPasteClick: () -> Unit, + private val onQrClick: () -> Unit, + private val onBackClick: () -> Unit, + private val onConfirmClick: () -> Unit, +) : Transformer { + + override fun transform(prevState: AddAddressUM): AddAddressUM { + return prevState.copy( + onAddressChange = onAddressChange, + onAddressClear = onAddressClear, + onPasteClick = onPasteClick, + onQrClick = onQrClick, + onBackClick = onBackClick, + buttonUM = prevState.buttonUM.copy(onClick = onConfirmClick), + ) + } +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/state/transformers/UpdateAddressInputTransformer.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/state/transformers/UpdateAddressInputTransformer.kt new file mode 100644 index 0000000000..f9b84f065e --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/state/transformers/UpdateAddressInputTransformer.kt @@ -0,0 +1,25 @@ +package com.tangem.features.addressbook.addaddress.state.transformers + +import com.tangem.core.ui.R +import com.tangem.core.ui.extensions.resourceReference +import com.tangem.features.addressbook.addaddress.ui.state.AddAddressUM +import com.tangem.utils.transformer.Transformer + +/** + * Updates the address field with a freshly entered/pasted [value] and clears any previous error, restoring the default + * label. The actual (re)validation runs after a debounce — see [UpdateAddressValidationTransformer]. + */ +internal class UpdateAddressInputTransformer( + private val value: String, +) : Transformer { + + override fun transform(prevState: AddAddressUM): AddAddressUM { + return prevState.copy( + addressField = prevState.addressField.copy( + value = value, + isError = false, + label = resourceReference(R.string.common_address), + ), + ) + } +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/state/transformers/UpdateAddressValidationTransformer.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/state/transformers/UpdateAddressValidationTransformer.kt new file mode 100644 index 0000000000..6d7c469965 --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/state/transformers/UpdateAddressValidationTransformer.kt @@ -0,0 +1,36 @@ +package com.tangem.features.addressbook.addaddress.state.transformers + +import com.tangem.blockchainsdk.utils.toBlockchain +import com.tangem.core.ui.R +import com.tangem.core.ui.extensions.resourceReference +import com.tangem.domain.models.currency.CryptoCurrency +import com.tangem.features.addressbook.addaddress.ui.state.AddAddressUM +import com.tangem.utils.transformer.Transformer + +/** + * Validates [address] against the wallet's [coins] and reflects the result in the UI. + * + * The network is not chosen on this screen (it is selected on the next screen), so the address is valid when it matches + * at least one of the available networks — the same blockchain check the Send flow uses. An invalid (non-empty, + * matching nothing) address surfaces the error in the field label and disables the confirm button. + */ +internal class UpdateAddressValidationTransformer( + private val address: String, + private val coins: List, +) : Transformer { + + override fun transform(prevState: AddAddressUM): AddAddressUM { + val hasMatchedAnyNetwork = address.isNotBlank() && + coins.any { it.network.toBlockchain().validateAddress(address) } + val isError = address.isNotBlank() && !hasMatchedAnyNetwork + val label = if (isError) { + resourceReference(R.string.address_book_invalid_address_error) + } else { + resourceReference(R.string.common_address) + } + return prevState.copy( + addressField = prevState.addressField.copy(isError = isError, label = label), + buttonUM = prevState.buttonUM.copy(isEnabled = hasMatchedAnyNetwork), + ) + } +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/ui/AddAddressContent.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/ui/AddAddressContent.kt index 9cf8321120..6a8d9f5cfe 100644 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/ui/AddAddressContent.kt +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/ui/AddAddressContent.kt @@ -3,14 +3,15 @@ package com.tangem.features.addressbook.addaddress.ui import android.content.res.Configuration import androidx.compose.foundation.background import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.tangem.core.ui.R -import com.tangem.core.ui.components.SpacerH12 -import com.tangem.core.ui.ds.button.PrimaryTangemButton +import com.tangem.core.ui.components.SpacerH import com.tangem.core.ui.ds.button.TangemButtonType import com.tangem.core.ui.ds.button.TangemButtonUM import com.tangem.core.ui.ds.image.TangemIconUM @@ -20,9 +21,8 @@ import com.tangem.core.ui.extensions.TextReference import com.tangem.core.ui.extensions.resourceReference import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreviewRedesign -import com.tangem.features.addressbook.addaddress.contract.AddAddressUM -import com.tangem.features.addressbook.addaddress.contract.AddressFieldUM -import kotlinx.collections.immutable.persistentListOf +import com.tangem.features.addressbook.addaddress.ui.state.AddAddressUM +import com.tangem.features.addressbook.addaddress.ui.state.AddressFieldUM @Composable internal fun AddAddressContent(state: AddAddressUM, modifier: Modifier = Modifier) { @@ -34,7 +34,6 @@ internal fun AddAddressContent(state: AddAddressUM, modifier: Modifier = Modifie horizontalAlignment = Alignment.CenterHorizontally, ) { TangemTopBar( - modifier = Modifier.statusBarsPadding(), title = resourceReference(R.string.address_book_add_address), startContent = { TangemButton( @@ -47,14 +46,23 @@ internal fun AddAddressContent(state: AddAddressUM, modifier: Modifier = Modifie ) RecipientRow( + modifier = Modifier.padding(horizontal = 16.dp), addressField = state.addressField, onValueChange = state.onAddressChange, onAddressClear = state.onAddressClear, onQrClick = state.onQrClick, onPasteClick = state.onPasteClick, ) - SpacerH12() - NetworkBlock(state.chosenNetworkStateUM) + SpacerH(20.dp) + NetworkBlock( + modifier = Modifier + .padding(horizontal = 16.dp) + .clip(RoundedCornerShape(16.dp)) + .fillMaxWidth() + .background(color = TangemTheme.colors3.bg.secondary), + chosenNetworkStateUM = state.chosenNetworkStateUM, + onNetworkSelectClick = state.onNetworkClick, + ) PrimaryButton(state.buttonUM) } } @@ -62,13 +70,15 @@ internal fun AddAddressContent(state: AddAddressUM, modifier: Modifier = Modifie @Composable private fun ColumnScope.PrimaryButton(buttonUM: TangemButtonUM) { Spacer(modifier = Modifier.weight(1f)) - - PrimaryTangemButton( + TangemButton( modifier = Modifier .fillMaxWidth() - .navigationBarsPadding() - .padding(start = 16.dp, end = 16.dp, bottom = 12.dp), - buttonUM = buttonUM, + .padding(horizontal = 16.dp, vertical = 12.dp), + onClick = buttonUM.onClick, + isEnabled = buttonUM.isEnabled, + isLoading = buttonUM.isLoading, + size = TangemButton.Size.X12, + text = buttonUM.text, ) } @@ -84,7 +94,6 @@ private fun Preview_AddAddressContent() { placeholder = resourceReference(R.string.address_book_enter_address), label = resourceReference(R.string.common_address), ), - availableNetworks = persistentListOf(), buttonUM = TangemButtonUM( text = TextReference.Res(R.string.address_book_add_address), type = TangemButtonType.Primary, @@ -97,6 +106,7 @@ private fun Preview_AddAddressContent() { onPasteClick = {}, onQrClick = {}, onBackClick = {}, + onNetworkClick = {}, ), ) } diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/ui/NetworkBlock.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/ui/NetworkBlock.kt index dc91b1d8b7..e2b3e1b6a5 100644 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/ui/NetworkBlock.kt +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/ui/NetworkBlock.kt @@ -1,86 +1,95 @@ package com.tangem.features.addressbook.addaddress.ui -import android.content.res.Configuration import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.border -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.wrapContentWidth +import androidx.compose.foundation.layout.* import androidx.compose.foundation.shape.CircleShape -import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.vectorResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import androidx.compose.ui.util.fastForEachIndexed import com.tangem.core.ui.R import com.tangem.core.ui.components.SpacerH12 +import com.tangem.core.ui.components.SpacerW import com.tangem.core.ui.ds2.loader.TangemLoader +import com.tangem.core.ui.ds2.loader.TangemLoaderSize import com.tangem.core.ui.ds2.row.TangemRow import com.tangem.core.ui.ds2.row.TangemRowVerticalAlignment +import com.tangem.core.ui.extensions.clickableSingle import com.tangem.core.ui.extensions.stringResourceSafe import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreviewRedesign -import com.tangem.features.addressbook.addaddress.contract.AddAddressUM -import com.tangem.features.addressbook.addaddress.contract.AddAddressUM.ChosenNetworkStateUM.Result.NetworkUM +import com.tangem.features.addressbook.addaddress.ui.state.AddAddressUM +import com.tangem.features.addressbook.addaddress.ui.state.AddAddressUM.ChosenNetworkStateUM.Result.NetworkUM +import com.tangem.utils.StringsSigns import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.toImmutableList private const val MAX_VISIBLE_NETWORKS = 3 -private val NetworkIconSize = 24.dp // Horizontal advance per icon. Smaller than the icon size so icons overlap; the bg-colored ring on // the icon drawn on top carves the crescent cut-out from the icon below. private val NetworkIconStep = 18.dp @Composable -internal fun NetworkBlock(chosenNetworkStateUM: AddAddressUM.ChosenNetworkStateUM) { +internal fun NetworkBlock( + onNetworkSelectClick: () -> Unit, + chosenNetworkStateUM: AddAddressUM.ChosenNetworkStateUM, + modifier: Modifier = Modifier, +) { TangemRow( verticalAlignment = TangemRowVerticalAlignment.Center, - modifier = Modifier - .padding(horizontal = 16.dp) - .clip(RoundedCornerShape(16.dp)) - .fillMaxWidth() - .background(color = TangemTheme.colors3.bg.secondary) - .padding(horizontal = 4.dp), + modifier = modifier, titleSlot = { Text( text = stringResourceSafe(R.string.common_network), - style = TangemTheme.typography.body2, + style = TangemTheme.typography3.body.medium, color = TangemTheme.colors3.text.primary, ) }, endSlot = { - SelectNetworkButton(chosenNetworkStateUM) + SelectNetworkButton( + onNetworkSelectClick = onNetworkSelectClick, + chosenNetworkStateUM = chosenNetworkStateUM, + ) }, ) } @Composable -private fun SelectNetworkButton(chosenNetworkStateUM: AddAddressUM.ChosenNetworkStateUM) { +private fun SelectNetworkButton( + onNetworkSelectClick: () -> Unit, + chosenNetworkStateUM: AddAddressUM.ChosenNetworkStateUM, +) { Row( + modifier = Modifier.clickableSingle( + onClick = onNetworkSelectClick, + enabled = chosenNetworkStateUM !is AddAddressUM.ChosenNetworkStateUM.Loading, + ), verticalAlignment = Alignment.CenterVertically, ) { when (chosenNetworkStateUM) { is AddAddressUM.ChosenNetworkStateUM.Result -> NetworkIconsResolver(chosenNetworkStateUM.networkUMList) - AddAddressUM.ChosenNetworkStateUM.Loading -> TangemLoader() + AddAddressUM.ChosenNetworkStateUM.Loading -> TangemLoader(size = TangemLoaderSize.X20) AddAddressUM.ChosenNetworkStateUM.Empty -> { Text( modifier = Modifier.padding(start = 8.dp), text = stringResourceSafe(R.string.address_book_select_network), - style = TangemTheme.typography.body2, + style = TangemTheme.typography3.body.medium, color = TangemTheme.colors3.text.secondary, ) + SpacerW(4.dp) ChevronIcon() } } @@ -100,7 +109,7 @@ private fun NetworkIconsResolver(networks: ImmutableList) { Text( modifier = Modifier.padding(start = 8.dp), text = network.networkName, - style = TangemTheme.typography.body2, + style = TangemTheme.typography3.body.medium, color = TangemTheme.colors3.text.secondary, ) ChevronIcon() @@ -120,7 +129,7 @@ private fun OverlappingNetworkIcons(networks: ImmutableList) { val remaining = networks.size - visible.size Box(modifier = Modifier.wrapContentWidth()) { - visible.forEachIndexed { index, network -> + visible.fastForEachIndexed { index, network -> Image( painter = painterResource(id = network.iconResId), contentDescription = null, @@ -128,7 +137,7 @@ private fun OverlappingNetworkIcons(networks: ImmutableList) { modifier = Modifier .padding(start = NetworkIconStep * index) .networkIconRing() - .size(NetworkIconSize), + .size(24.dp), ) } if (remaining > 0) { @@ -137,12 +146,13 @@ private fun OverlappingNetworkIcons(networks: ImmutableList) { .padding(start = NetworkIconStep * visible.size) .networkIconRing() .background(color = TangemTheme.colors3.bg.tertiary) - .size(NetworkIconSize), + .heightIn(min = 24.dp) + .padding(vertical = 2.dp, horizontal = 4.dp), contentAlignment = Alignment.Center, ) { Text( - text = "+$remaining", - style = TangemTheme.typography.caption1, + text = "${StringsSigns.PLUS}$remaining", + style = TangemTheme.typography3.caption.medium, color = TangemTheme.colors3.text.secondary, ) } @@ -160,20 +170,23 @@ private fun Modifier.networkIconRing(): Modifier = this @Composable private fun ChevronIcon() { - Image( - modifier = Modifier.padding(start = 8.dp), - painter = painterResource(id = R.drawable.ic_select_18_24), + Icon( + modifier = Modifier + .padding(start = 8.dp) + .size(20.dp), + tint = TangemTheme.colors3.icon.secondary, + imageVector = ImageVector.vectorResource(id = R.drawable.ic_select_18_24), contentDescription = null, ) } -@Preview -@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES) +@Preview(showBackground = true) @Composable private fun Preview_NetworkBlock() { TangemThemePreviewRedesign { Column { NetworkBlock( + onNetworkSelectClick = {}, chosenNetworkStateUM = AddAddressUM.ChosenNetworkStateUM.Result( networkUMList = persistentListOf( NetworkUM(networkName = "Ethereum", iconResId = R.drawable.img_eth_22), @@ -182,6 +195,7 @@ private fun Preview_NetworkBlock() { ) SpacerH12() NetworkBlock( + onNetworkSelectClick = {}, chosenNetworkStateUM = AddAddressUM.ChosenNetworkStateUM.Result( networkUMList = persistentListOf( NetworkUM(networkName = "Ethereum", iconResId = R.drawable.img_eth_22), @@ -192,6 +206,7 @@ private fun Preview_NetworkBlock() { ) SpacerH12() NetworkBlock( + onNetworkSelectClick = {}, chosenNetworkStateUM = AddAddressUM.ChosenNetworkStateUM.Result( networkUMList = List(15) { NetworkUM(networkName = "Network", iconResId = R.drawable.img_eth_22) @@ -199,9 +214,9 @@ private fun Preview_NetworkBlock() { ), ) SpacerH12() - NetworkBlock(chosenNetworkStateUM = AddAddressUM.ChosenNetworkStateUM.Loading) + NetworkBlock(chosenNetworkStateUM = AddAddressUM.ChosenNetworkStateUM.Loading, onNetworkSelectClick = {}) SpacerH12() - NetworkBlock(chosenNetworkStateUM = AddAddressUM.ChosenNetworkStateUM.Empty) + NetworkBlock(chosenNetworkStateUM = AddAddressUM.ChosenNetworkStateUM.Empty, onNetworkSelectClick = {}) } } } \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/ui/RecipientRow.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/ui/RecipientRow.kt index 8ebe82cc0f..aadf4f91ca 100644 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/ui/RecipientRow.kt +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/ui/RecipientRow.kt @@ -3,11 +3,7 @@ package com.tangem.features.addressbook.addaddress.ui import android.content.res.Configuration import androidx.compose.foundation.background import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.* import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Icon @@ -19,7 +15,6 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.tangem.core.ui.R import com.tangem.core.ui.components.SpacerH12 -import com.tangem.core.ui.components.SpacerW8 import com.tangem.core.ui.components.fields.SimpleTextField import com.tangem.core.ui.ds.image.TangemIcon import com.tangem.core.ui.ds.image.TangemIconUM @@ -28,13 +23,14 @@ import com.tangem.core.ui.ds2.row.TangemRow import com.tangem.core.ui.ds2.row.TangemRowContentLead import com.tangem.core.ui.ds2.row.TangemRowVerticalAlignment import com.tangem.core.ui.extensions.TextReference +import com.tangem.core.ui.extensions.resolveReference import com.tangem.core.ui.extensions.resourceReference -import com.tangem.core.ui.extensions.stringResourceSafe import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreviewRedesign import com.tangem.core.ui.res.generated.icons.Icons import com.tangem.core.ui.res.generated.icons.ic_cross_circle_20_filled -import com.tangem.features.addressbook.addaddress.contract.AddressFieldUM +import com.tangem.core.ui.res.generated.icons.ic_scan_20 +import com.tangem.features.addressbook.addaddress.ui.state.AddressFieldUM @Composable internal fun RecipientRow( @@ -43,19 +39,23 @@ internal fun RecipientRow( onAddressClear: () -> Unit, onQrClick: () -> Unit, onPasteClick: () -> Unit, + modifier: Modifier = Modifier, ) { Column( - modifier = Modifier - .padding(horizontal = 16.dp) - .clip(RoundedCornerShape(16.dp)) + modifier = modifier + .clip(RoundedCornerShape(24.dp)) .fillMaxWidth() .background(TangemTheme.colors3.bg.secondary), ) { Text( - modifier = Modifier.padding(start = 16.dp, top = 16.dp), - text = stringResourceSafe(R.string.common_address), - style = TangemTheme.typography.caption1, - color = TangemTheme.colors3.text.secondary, + modifier = Modifier.padding(start = 16.dp, top = 16.dp, bottom = 4.dp), + text = addressField.label.resolveReference(), + style = TangemTheme.typography3.caption.medium, + color = if (addressField.isError) { + TangemTheme.colors3.text.status.error + } else { + TangemTheme.colors3.text.secondary + }, ) TangemRow( modifier = Modifier.fillMaxWidth(), @@ -64,7 +64,7 @@ internal fun RecipientRow( startSlot = { TangemIcon( modifier = Modifier - .size(36.dp) + .size(40.dp) .clip(CircleShape) .background(TangemTheme.colors3.bg.tertiary), tangemIconUM = TangemIconUM.Ident(text = addressField.value), @@ -72,43 +72,55 @@ internal fun RecipientRow( }, titleSlot = { SimpleTextField( - modifier = Modifier - .weight(1f) - .padding(start = 12.dp), + modifier = Modifier.weight(1f), value = addressField.value, onValueChange = onValueChange, - placeholder = TextReference.Res(R.string.address_book_enter_address), - singleLine = false, + placeholder = addressField.placeholder, ) }, endSlot = { - if (addressField.value.isNotEmpty()) { - Icon( - modifier = Modifier.clickable(onClick = onAddressClear), - imageVector = Icons.ic_cross_circle_20_filled, - tint = TangemTheme.colors3.icon.tertiary, - contentDescription = null, - ) - } else { - Row { - TangemButton( - variant = TangemButton.Variant.Secondary, - iconStart = TangemIconUM.Icon(iconRes = R.drawable.ic_qrcode_scaner_24), - onClick = onQrClick, - ) - SpacerW8() - TangemButton( - variant = TangemButton.Variant.Primary, - text = TextReference.Res(id = R.string.common_paste), - onClick = onPasteClick, - ) - } - } + RecipientEndSlot( + hasValue = addressField.value.isNotEmpty(), + onAddressClear = onAddressClear, + onQrClick = onQrClick, + onPasteClick = onPasteClick, + ) }, ) } } +@Composable +private fun RecipientEndSlot( + hasValue: Boolean, + onAddressClear: () -> Unit, + onQrClick: () -> Unit, + onPasteClick: () -> Unit, +) { + if (hasValue) { + Icon( + modifier = Modifier + .clip(CircleShape) + .clickable(onClick = onAddressClear), + imageVector = Icons.ic_cross_circle_20_filled, + tint = TangemTheme.colors3.icon.tertiary, + contentDescription = null, + ) + } else { + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + TangemButton( + variant = TangemButton.Variant.Secondary, + iconStart = TangemIconUM.Icon(imageVector = Icons.ic_scan_20), + onClick = onQrClick, + ) + TangemButton( + text = TextReference.Res(id = R.string.common_paste), + onClick = onPasteClick, + ) + } + } +} + @Preview @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES) @Composable diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/contract/AddAddressUM.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/ui/state/AddAddressUM.kt similarity index 62% rename from features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/contract/AddAddressUM.kt rename to features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/ui/state/AddAddressUM.kt index d54c5e1716..45704c2355 100644 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/contract/AddAddressUM.kt +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/ui/state/AddAddressUM.kt @@ -1,14 +1,13 @@ -package com.tangem.features.addressbook.addaddress.contract +package com.tangem.features.addressbook.addaddress.ui.state import androidx.annotation.DrawableRes import androidx.compose.runtime.Immutable import com.tangem.core.ui.ds.button.TangemButtonUM -import com.tangem.domain.models.network.Network import kotlinx.collections.immutable.ImmutableList +@Immutable internal data class AddAddressUM( val addressField: AddressFieldUM, - val availableNetworks: ImmutableList, val buttonUM: TangemButtonUM, val chosenNetworkStateUM: ChosenNetworkStateUM, val onAddressChange: (String) -> Unit, @@ -16,15 +15,14 @@ internal data class AddAddressUM( val onPasteClick: () -> Unit, val onQrClick: () -> Unit, val onBackClick: () -> Unit, + val onNetworkClick: () -> Unit, ) { @Immutable - sealed class ChosenNetworkStateUM { - data object Loading : ChosenNetworkStateUM() - data object Empty : ChosenNetworkStateUM() - data class Result( - val networkUMList: ImmutableList, - ) : ChosenNetworkStateUM() { + sealed interface ChosenNetworkStateUM { + data object Loading : ChosenNetworkStateUM + data object Empty : ChosenNetworkStateUM + data class Result(val networkUMList: ImmutableList) : ChosenNetworkStateUM { data class NetworkUM( val networkName: String, @DrawableRes val iconResId: Int, diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/contract/AddressFieldUM.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/ui/state/AddressFieldUM.kt similarity index 54% rename from features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/contract/AddressFieldUM.kt rename to features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/ui/state/AddressFieldUM.kt index ea8e324bd7..2e65e1b381 100644 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/contract/AddressFieldUM.kt +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addaddress/ui/state/AddressFieldUM.kt @@ -1,4 +1,4 @@ -package com.tangem.features.addressbook.addaddress.contract +package com.tangem.features.addressbook.addaddress.ui.state import com.tangem.core.ui.extensions.TextReference @@ -7,7 +7,4 @@ internal data class AddressFieldUM( val placeholder: TextReference, val label: TextReference, val isError: Boolean = false, - val error: TextReference? = null, - val isValuePasted: Boolean = false, - val blockchainAddress: String? = null, ) \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addressselector/DefaultAddressSelectorComponent.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addressselector/DefaultAddressSelectorComponent.kt new file mode 100644 index 0000000000..6b94731ad1 --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addressselector/DefaultAddressSelectorComponent.kt @@ -0,0 +1,34 @@ +package com.tangem.features.addressbook.addressselector + +import androidx.compose.runtime.Composable +import com.tangem.core.decompose.context.AppComponentContext +import com.tangem.features.addressbook.AddressSelectorComponent +import com.tangem.features.addressbook.addressselector.ui.AddressSelectorBottomSheet +import dagger.assisted.Assisted +import dagger.assisted.AssistedFactory +import dagger.assisted.AssistedInject + +internal class DefaultAddressSelectorComponent @AssistedInject constructor( + @Assisted appComponentContext: AppComponentContext, + @Assisted private val params: AddressSelectorComponent.Params, +) : AddressSelectorComponent, AppComponentContext by appComponentContext { + + override fun dismiss() = params.onDismiss() + + @Composable + override fun BottomSheet() { + AddressSelectorBottomSheet( + contact = params.contact, + onAddressClick = { entry -> params.onAddressSelected(params.contact.toSelectedContact(entry)) }, + onDismiss = ::dismiss, + ) + } + + @AssistedFactory + interface Factory : AddressSelectorComponent.Factory { + override fun create( + context: AppComponentContext, + params: AddressSelectorComponent.Params, + ): DefaultAddressSelectorComponent + } +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addressselector/ui/AddressSelectorBottomSheet.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addressselector/ui/AddressSelectorBottomSheet.kt new file mode 100644 index 0000000000..cd305175a2 --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/addressselector/ui/AddressSelectorBottomSheet.kt @@ -0,0 +1,159 @@ +package com.tangem.features.addressbook.addressselector.ui + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.compose.ui.util.fastForEach +import com.tangem.common.ui.account.AccountIconUM +import com.tangem.core.ui.components.bottomsheets.TangemBottomSheet +import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig +import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfigContent +import com.tangem.core.ui.ds.image.TangemIcon +import com.tangem.core.ui.ds.image.TangemIconUM +import com.tangem.core.ui.ds.topbar.TangemTopBar +import com.tangem.core.ui.ds.topbar.TangemTopBarType +import com.tangem.core.ui.ds2.button.TangemButton +import com.tangem.core.ui.ds2.row.TangemRow +import com.tangem.core.ui.ds2.row.TangemRowText +import com.tangem.core.ui.ds2.row.TangemRowTextRole +import com.tangem.core.ui.ds2.row.TangemRowVerticalAlignment +import com.tangem.core.ui.extensions.resourceReference +import com.tangem.core.ui.res.TangemTheme +import com.tangem.core.ui.res.TangemThemePreviewRedesign +import com.tangem.domain.models.account.CryptoPortfolioIcon +import com.tangem.features.addressbook.MatchedContact +import com.tangem.features.addressbook.impl.R +import kotlinx.collections.immutable.persistentListOf + +@Composable +internal fun AddressSelectorBottomSheet( + contact: MatchedContact, + onAddressClick: (MatchedContact.ContactAddress) -> Unit, + onDismiss: () -> Unit, +) { + TangemBottomSheet( + config = TangemBottomSheetConfig( + isShown = true, + onDismissRequest = onDismiss, + content = TangemBottomSheetConfigContent.Empty, + ), + containerColor = TangemTheme.colors3.bg.primary, + title = { + TangemTopBar( + title = resourceReference(R.string.address_book_choose_address), + type = TangemTopBarType.BottomSheet, + endContent = { + TangemButton( + iconStart = TangemIconUM.Icon(iconRes = R.drawable.ic_close_24), + onClick = onDismiss, + size = TangemButton.Size.X11, + variant = TangemButton.Variant.Material, + ) + }, + ) + }, + content = { AddressSelectorList(contact = contact, onAddressClick = onAddressClick) }, + footer = { + TangemButton( + onClick = onDismiss, + text = resourceReference(R.string.common_cancel), + variant = TangemButton.Variant.Secondary, + modifier = Modifier + .fillMaxWidth() + .padding(16.dp), + ) + }, + ) +} + +@Composable +private fun AddressSelectorList( + contact: MatchedContact, + onAddressClick: (MatchedContact.ContactAddress) -> Unit, + modifier: Modifier = Modifier, +) { + Column( + modifier = modifier + .background( + color = TangemTheme.colors3.bg.secondary, + shape = RoundedCornerShape(20.dp), + ) + .verticalScroll(rememberScrollState()), + ) { + contact.entries.fastForEach { entry -> + AddressRow(entry = entry, onClick = { onAddressClick(entry) }) + } + } +} + +@Composable +private fun AddressRow(entry: MatchedContact.ContactAddress, onClick: () -> Unit) { + TangemRow( + verticalAlignment = TangemRowVerticalAlignment.Center, + onClick = onClick, + startSlot = { + TangemIcon( + tangemIconUM = TangemIconUM.Ident(entry.address), + modifier = Modifier + .size(40.dp) + .clip(CircleShape), + ) + }, + titleSlot = { + TangemRowText( + text = entry.address, + role = TangemRowTextRole.Title, + overflow = TextOverflow.MiddleEllipsis, + ) + }, + subtitleSlot = { + TangemRowText( + text = entry.networkName, + role = TangemRowTextRole.Subtitle, + ) + }, + ) +} + +@Composable +@Preview(showBackground = true, widthDp = 360) +private fun Preview_AddressSelectorList() { + TangemThemePreviewRedesign { + AddressSelectorList( + contact = MatchedContact( + contactId = "1", + name = "Binance", + icon = AccountIconUM.CryptoPortfolio( + value = CryptoPortfolioIcon.Icon.Letter, + color = CryptoPortfolioIcon.Color.Azure, + ), + networkId = "ethereum", + entries = persistentListOf( + MatchedContact.ContactAddress( + address = "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D", + memo = null, + networkName = "Ethereum", + ), + MatchedContact.ContactAddress( + address = "0x34B4492A412D84A6E606288f3Bd714b89135D4dE", + memo = "12345", + networkName = "Ethereum", + ), + ), + ), + onAddressClick = {}, + ) + } +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/block/DefaultAddressBookContactsBlockComponent.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/block/DefaultAddressBookContactsBlockComponent.kt new file mode 100644 index 0000000000..c189ace95c --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/block/DefaultAddressBookContactsBlockComponent.kt @@ -0,0 +1,36 @@ +package com.tangem.features.addressbook.block + +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.ui.Modifier +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.tangem.core.decompose.context.AppComponentContext +import com.tangem.core.decompose.model.getOrCreateModel +import com.tangem.features.addressbook.AddressBookContactsBlockComponent +import com.tangem.features.addressbook.block.model.ContactsBlockModel +import com.tangem.features.addressbook.block.ui.ContactsBlock +import dagger.assisted.Assisted +import dagger.assisted.AssistedFactory +import dagger.assisted.AssistedInject + +internal class DefaultAddressBookContactsBlockComponent @AssistedInject constructor( + @Assisted appComponentContext: AppComponentContext, + @Assisted params: AddressBookContactsBlockComponent.Params, +) : AddressBookContactsBlockComponent, AppComponentContext by appComponentContext { + + private val model: ContactsBlockModel = getOrCreateModel(params) + + @Composable + override fun Content(modifier: Modifier) { + val state by model.state.collectAsStateWithLifecycle() + ContactsBlock(state = state, modifier = modifier) + } + + @AssistedFactory + interface Factory : AddressBookContactsBlockComponent.Factory { + override fun create( + context: AppComponentContext, + params: AddressBookContactsBlockComponent.Params, + ): DefaultAddressBookContactsBlockComponent + } +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/block/model/ContactsBlockModel.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/block/model/ContactsBlockModel.kt new file mode 100644 index 0000000000..1aa457aced --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/block/model/ContactsBlockModel.kt @@ -0,0 +1,50 @@ +package com.tangem.features.addressbook.block.model + +import com.tangem.core.decompose.di.ModelScoped +import com.tangem.core.decompose.model.Model +import com.tangem.core.decompose.model.ParamsContainer +import com.tangem.domain.addressbook.usecase.GetContactsUseCase +import com.tangem.features.addressbook.AddressBookContactsBlockComponent +import com.tangem.features.addressbook.block.state.ContactsBlockStateController +import com.tangem.features.addressbook.block.state.transformers.UpdateContactsBlockStateTransformer +import com.tangem.features.addressbook.block.ui.state.ContactsBlockUM +import com.tangem.features.addressbook.common.ContactMatcher +import com.tangem.utils.coroutines.CoroutineDispatcherProvider +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach +import javax.inject.Inject + +@OptIn(ExperimentalCoroutinesApi::class) +@ModelScoped +internal class ContactsBlockModel @Inject constructor( + paramsContainer: ParamsContainer, + override val dispatchers: CoroutineDispatcherProvider, + private val stateController: ContactsBlockStateController, + getContactsUseCase: GetContactsUseCase, +) : Model() { + + private val params = paramsContainer.require() + + val state: StateFlow get() = stateController.uiState + + init { + params.queryFlow + .flatMapLatest { query -> getContactsUseCase(query = query, userWalletId = params.userWalletId) } + .onEach { contacts -> + val matched = ContactMatcher.match(contacts = contacts, networkId = params.network.rawId) + stateController.update( + UpdateContactsBlockStateTransformer( + matched = matched, + onSeeAllClick = params.onSeeAllClick, + onContactClick = params.onContactClick, + ), + ) + } + .flowOn(dispatchers.default) + .launchIn(modelScope) + } +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/block/state/ContactsBlockStateController.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/block/state/ContactsBlockStateController.kt new file mode 100644 index 0000000000..a0367bbd82 --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/block/state/ContactsBlockStateController.kt @@ -0,0 +1,20 @@ +package com.tangem.features.addressbook.block.state + +import com.tangem.core.decompose.di.ModelScoped +import com.tangem.features.addressbook.block.ui.state.ContactsBlockUM +import com.tangem.utils.transformer.Transformer +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.update +import javax.inject.Inject + +@ModelScoped +internal class ContactsBlockStateController @Inject constructor() { + + val uiState: StateFlow + field = MutableStateFlow(value = ContactsBlockUM.Hidden) + + fun update(transformer: Transformer) { + uiState.update(function = transformer::transform) + } +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/block/state/transformers/UpdateContactsBlockStateTransformer.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/block/state/transformers/UpdateContactsBlockStateTransformer.kt new file mode 100644 index 0000000000..c267bfd65d --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/block/state/transformers/UpdateContactsBlockStateTransformer.kt @@ -0,0 +1,41 @@ +package com.tangem.features.addressbook.block.state.transformers + +import com.tangem.features.addressbook.MatchedContact +import com.tangem.features.addressbook.block.ui.state.ContactsBlockUM +import com.tangem.features.addressbook.list.ui.state.ContactUM +import com.tangem.utils.transformer.Transformer +import kotlinx.collections.immutable.toImmutableList + +/** Builds the Send contacts block from the network-matching contacts; an empty result hides the block. */ +internal class UpdateContactsBlockStateTransformer( + private val matched: List, + private val onSeeAllClick: () -> Unit, + private val onContactClick: (MatchedContact) -> Unit, +) : Transformer { + + override fun transform(prevState: ContactsBlockUM): ContactsBlockUM { + return if (matched.isEmpty()) { + ContactsBlockUM.Hidden + } else { + ContactsBlockUM.Content( + contacts = matched + .take(MAX_CONTACTS) + .map { it.toRowUM() }.toImmutableList(), + onSeeAllClick = onSeeAllClick, + shouldShowSeeAll = matched.size > MAX_CONTACTS, + ) + } + } + + private fun MatchedContact.toRowUM(): ContactUM = ContactUM( + id = contactId, + name = name, + icon = icon, + networkAddressCount = entries.size, + onClick = { onContactClick(this) }, + ) + + private companion object { + const val MAX_CONTACTS = 5 + } +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/block/ui/ContactsBlock.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/block/ui/ContactsBlock.kt new file mode 100644 index 0000000000..ca1526a0a5 --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/block/ui/ContactsBlock.kt @@ -0,0 +1,101 @@ +package com.tangem.features.addressbook.block.ui + +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import com.tangem.common.ui.account.AccountIconUM +import com.tangem.core.ui.R +import com.tangem.core.ui.extensions.stringResourceSafe +import com.tangem.core.ui.res.TangemTheme +import com.tangem.core.ui.res.TangemThemePreviewRedesign +import com.tangem.domain.models.account.CryptoPortfolioIcon +import com.tangem.features.addressbook.block.ui.state.ContactsBlockUM +import com.tangem.features.addressbook.common.ui.ContactRow +import com.tangem.features.addressbook.list.ui.state.ContactUM +import kotlinx.collections.immutable.persistentListOf + +@Composable +internal fun ContactsBlock(state: ContactsBlockUM, modifier: Modifier = Modifier) { + if (state !is ContactsBlockUM.Content) return + Column( + modifier = modifier + .fillMaxWidth() + .clip(RoundedCornerShape(16.dp)) + .background(TangemTheme.colors3.bg.secondary), + ) { + Header(onSeeAllClick = state.onSeeAllClick, shouldShowSeeAll = state.shouldShowSeeAll) + state.contacts.forEach { contact -> + ContactRow(contact = contact) + } + } +} + +@Composable +private fun Header(onSeeAllClick: () -> Unit, shouldShowSeeAll: Boolean) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp) + .padding(top = 16.dp, bottom = 4.dp), + ) { + Text( + text = stringResourceSafe(R.string.address_book_title), + color = TangemTheme.colors3.text.secondary, + style = TangemTheme.typography3.caption.medium, + modifier = Modifier.weight(1f), + ) + if (shouldShowSeeAll) { + Text( + text = stringResourceSafe(R.string.common_view_all), + color = TangemTheme.colors3.text.brand, + style = TangemTheme.typography3.caption.medium, + modifier = Modifier.clickable(onClick = onSeeAllClick), + ) + } + } +} + +@Composable +@Preview(showBackground = true, widthDp = 360) +private fun Preview_ContactsBlock() { + TangemThemePreviewRedesign { + ContactsBlock( + state = ContactsBlockUM.Content( + contacts = persistentListOf( + ContactUM( + id = "1", + name = "Binance", + icon = AccountIconUM.CryptoPortfolio( + value = CryptoPortfolioIcon.Icon.Letter, + color = CryptoPortfolioIcon.Color.Azure, + ), + networkAddressCount = 1, + onClick = {}, + ), + ContactUM( + id = "2", + name = "Alice", + icon = AccountIconUM.CryptoPortfolio( + value = CryptoPortfolioIcon.Icon.Letter, + color = CryptoPortfolioIcon.Color.UFOGreen, + ), + networkAddressCount = 3, + onClick = {}, + ), + ), + onSeeAllClick = {}, + shouldShowSeeAll = true, + ), + ) + } +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/block/ui/state/ContactsBlockUM.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/block/ui/state/ContactsBlockUM.kt new file mode 100644 index 0000000000..acf334bbb9 --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/block/ui/state/ContactsBlockUM.kt @@ -0,0 +1,18 @@ +package com.tangem.features.addressbook.block.ui.state + +import androidx.compose.runtime.Immutable +import com.tangem.features.addressbook.list.ui.state.ContactUM +import kotlinx.collections.immutable.ImmutableList + +/** UI state of the Send contacts block. [Hidden] is rendered as nothing (no matching contacts / feature off). */ +@Immutable +internal sealed interface ContactsBlockUM { + + data object Hidden : ContactsBlockUM + + data class Content( + val shouldShowSeeAll: Boolean, + val contacts: ImmutableList, + val onSeeAllClick: () -> Unit, + ) : ContactsBlockUM +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/common/AddressBookChildFactory.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/common/AddressBookChildFactory.kt new file mode 100644 index 0000000000..d07a64c7f5 --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/common/AddressBookChildFactory.kt @@ -0,0 +1,61 @@ +package com.tangem.features.addressbook.common + +import com.tangem.core.decompose.context.AppComponentContext +import com.tangem.core.ui.decompose.ComposableContentComponent +import com.tangem.domain.addressbook.model.ContactId +import com.tangem.features.addressbook.AddressSelectorComponent +import com.tangem.features.addressbook.addaddress.DefaultAddAddressComponent +import com.tangem.features.addressbook.editcontact.DefaultEditContactComponent +import com.tangem.features.addressbook.editcontact.ui.state.ValidatedAddress +import com.tangem.features.addressbook.list.DefaultAddressBookListComponent +import com.tangem.features.addressbook.route.AddressBookRoute +import kotlinx.collections.immutable.persistentListOf +import javax.inject.Inject + +/** + * Builds the child screens of the address book feature for a given [AddressBookRoute], wiring their callbacks to the + * container's [AddressBookClickIntents]. Mirrors the `FeedEntryChildFactory` pattern used by the feed feature. + */ +internal class AddressBookChildFactory @Inject constructor( + private val addressSelectorFactory: AddressSelectorComponent.Factory, +) { + + fun createChild( + route: AddressBookRoute, + context: AppComponentContext, + clickIntents: AddressBookClickIntents, + ): ComposableContentComponent = when (route) { + is AddressBookRoute.List -> DefaultAddressBookListComponent( + appComponentContext = context, + params = DefaultAddressBookListComponent.Params( + mode = route.mode, + onContactClick = { clickIntents.onContactClick(ContactId(it)) }, + onAddContactClick = clickIntents::onAddContactClick, + ), + addressSelectorFactory = addressSelectorFactory, + ) + is AddressBookRoute.EditContact -> DefaultEditContactComponent( + appComponentContext = context, + params = DefaultEditContactComponent.Params( + contactId = route.contactId?.let(::ContactId), + predefinedAddress = buildPredefinedAddress(route), + onBackClick = clickIntents::onEditContactBack, + onAddAddressClick = clickIntents::onAddAddressClick, + ), + ) + AddressBookRoute.AddAddress -> DefaultAddAddressComponent( + appComponentContext = context, + params = DefaultAddAddressComponent.Params( + onBackClick = clickIntents::onAddAddressBack, + onConfirm = clickIntents::onAddressConfirmed, + ), + ) + } + + /** Builds the address attached up-front in WithContactCreation mode, when both the address and network are known. */ + private fun buildPredefinedAddress(route: AddressBookRoute.EditContact): ValidatedAddress? { + val address = route.predefinedAddress ?: return null + val networkId = route.predefinedNetworkId ?: return null + return ValidatedAddress(address = address, networkIds = persistentListOf(networkId)) + } +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/common/AddressBookClickIntents.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/common/AddressBookClickIntents.kt new file mode 100644 index 0000000000..5b13a5204f --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/common/AddressBookClickIntents.kt @@ -0,0 +1,26 @@ +package com.tangem.features.addressbook.common + +import com.tangem.domain.addressbook.model.ContactId +import com.tangem.features.addressbook.editcontact.ui.state.ValidatedAddress + +/** + * Navigation/click contract that the container ([DefaultAddressBookComponent]) implements and passes down to its + * children through [AddressBookChildFactory]. Keeping all cross-screen intents in one place removes the need for the + * children to know about each other or about navigation. + * + * Result delivery (the confirmed address) is handled out-of-band by [AddressBookResultHolder], not by this contract. + */ +internal interface AddressBookClickIntents { + + fun onContactClick(contactId: ContactId) + + fun onAddContactClick() + + fun onEditContactBack() + + fun onAddAddressClick() + + fun onAddAddressBack() + + fun onAddressConfirmed(address: ValidatedAddress) +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/common/AddressBookResultHolder.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/common/AddressBookResultHolder.kt new file mode 100644 index 0000000000..1ba1423a22 --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/common/AddressBookResultHolder.kt @@ -0,0 +1,29 @@ +package com.tangem.features.addressbook.common + +import com.tangem.features.addressbook.editcontact.ui.state.ValidatedAddress +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import javax.inject.Inject +import javax.inject.Singleton + +/** + * Carries a [ValidatedAddress] confirmed on the AddAddress screen over to the EditContact screen. + * + * The two screens live in independent model scopes, so a shared singleton holder is used to hand the result over + * instead of routing it through navigation/click intents. The producer calls [setConfirmedAddress]; the consumer + * observes [confirmedAddress] and calls [clear] after applying the value so it is not re-applied on resubscription. + */ +@Singleton +internal class AddressBookResultHolder @Inject constructor() { + + val confirmedAddress: StateFlow + field = MutableStateFlow(null) + + fun setConfirmedAddress(address: ValidatedAddress) { + confirmedAddress.value = address + } + + fun clear() { + confirmedAddress.value = null + } +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/common/ContactMatcher.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/common/ContactMatcher.kt new file mode 100644 index 0000000000..c044f8e480 --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/common/ContactMatcher.kt @@ -0,0 +1,43 @@ +package com.tangem.features.addressbook.common + +import com.tangem.common.ui.account.AccountIconUM +import com.tangem.domain.addressbook.model.Contact +import com.tangem.domain.models.account.CryptoPortfolioIcon +import com.tangem.features.addressbook.MatchedContact +import kotlinx.collections.immutable.toImmutableList + +/** + * Maps contacts to [MatchedContact]s for a given [networkId], keeping only those that have at least one address in that + * network (with just the matching entries). Name/address query filtering is done upstream by `GetContactsUseCase`. + */ +internal object ContactMatcher { + + private val DEFAULT_ICON_COLOR = CryptoPortfolioIcon.Color.Azure + + fun match(contacts: List, networkId: String): List { + return contacts.mapNotNull { contact -> + val entries = contact.addressEntries.filter { it.networkId.value == networkId } + if (entries.isEmpty()) return@mapNotNull null + + MatchedContact( + contactId = contact.id.value, + name = contact.name.value, + icon = AccountIconUM.CryptoPortfolio( + value = CryptoPortfolioIcon.Icon.Letter, + color = contact.resolveIconColor(), + ), + networkId = networkId, + entries = entries.map { entry -> + MatchedContact.ContactAddress( + address = entry.address, + memo = entry.memo, + networkName = entry.networkName, + ) + }.toImmutableList(), + ) + } + } + + private fun Contact.resolveIconColor(): CryptoPortfolioIcon.Color = + CryptoPortfolioIcon.Color.entries.firstOrNull { it.name == iconColor } ?: DEFAULT_ICON_COLOR +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/common/DefaultAddressBookComponent.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/common/DefaultAddressBookComponent.kt new file mode 100644 index 0000000000..5066885b29 --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/common/DefaultAddressBookComponent.kt @@ -0,0 +1,120 @@ +package com.tangem.features.addressbook.common + +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.ui.Modifier +import com.arkivanov.decompose.ComponentContext +import com.arkivanov.decompose.extensions.compose.stack.Children +import com.arkivanov.decompose.extensions.compose.stack.animation.slide +import com.arkivanov.decompose.extensions.compose.stack.animation.stackAnimation +import com.arkivanov.decompose.extensions.compose.subscribeAsState +import com.arkivanov.decompose.router.stack.StackNavigation +import com.arkivanov.decompose.router.stack.childStack +import com.arkivanov.decompose.router.stack.pop +import com.arkivanov.decompose.router.stack.pushNew +import com.tangem.common.routing.entity.AddressBookOpenMode +import com.tangem.core.decompose.context.AppComponentContext +import com.tangem.core.decompose.context.childByContext +import com.tangem.core.ui.decompose.ComposableContentComponent +import com.tangem.domain.addressbook.model.ContactId +import com.tangem.features.addressbook.AddressBookComponent +import com.tangem.features.addressbook.editcontact.ui.state.ValidatedAddress +import com.tangem.features.addressbook.route.AddressBookRoute +import dagger.assisted.Assisted +import dagger.assisted.AssistedFactory +import dagger.assisted.AssistedInject + +internal class DefaultAddressBookComponent @AssistedInject constructor( + @Assisted context: AppComponentContext, + @Assisted private val params: AddressBookComponent.Params, + private val childFactory: AddressBookChildFactory, + private val resultHolder: AddressBookResultHolder, +) : AddressBookComponent, AppComponentContext by context { + + private val navigation = StackNavigation() + + init { + // Drop any address left over from a previous session before the (possibly preloaded) stack starts collecting. + resultHolder.clear() + } + + private val clickIntents = object : AddressBookClickIntents { + + override fun onContactClick(contactId: ContactId) { + navigation.pushNew(AddressBookRoute.EditContact(contactId = contactId.value)) + } + + override fun onAddContactClick() { + navigation.pushNew(AddressBookRoute.EditContact()) + } + + override fun onEditContactBack() { + navigation.pop() + } + + override fun onAddAddressClick() { + navigation.pushNew(AddressBookRoute.AddAddress) + } + + override fun onAddAddressBack() { + navigation.pop() + } + + override fun onAddressConfirmed(address: ValidatedAddress) { + resultHolder.setConfirmedAddress(address) + navigation.pop() + } + } + + private val contentStack = childStack( + key = "address_book_stack", + source = navigation, + serializer = AddressBookRoute.serializer(), + initialStack = ::initialStack, + handleBackButton = false, + childFactory = ::screenChild, + ) + + @Composable + override fun Content(modifier: Modifier) { + val childStack by contentStack.subscribeAsState() + Children( + modifier = modifier, + stack = childStack, + animation = stackAnimation(slide()), + ) { child -> + child.instance.Content(Modifier) + } + } + + private fun screenChild(config: AddressBookRoute, componentContext: ComponentContext): ComposableContentComponent { + return childFactory.createChild( + route = config, + context = childByContext(componentContext), + clickIntents = clickIntents, + ) + } + + private fun initialStack(): List = when (val mode = params.addressBookOpenMode) { + AddressBookOpenMode.Default -> listOf(AddressBookRoute.List()) + is AddressBookOpenMode.ContactSelection -> listOf( + AddressBookRoute.List(mode = AddressBookRoute.ListMode.Selector(networkId = mode.networkId)), + ) + is AddressBookOpenMode.WithContactCreation -> listOf( + AddressBookRoute.List(), + // Address + network are already known, so open the new contact with that address attached — no AddAddress. + AddressBookRoute.EditContact( + predefinedAddress = mode.address, + predefinedNetworkId = mode.networkId, + ), + ) + } + + @AssistedFactory + interface Factory : AddressBookComponent.Factory { + override fun create( + context: AppComponentContext, + params: AddressBookComponent.Params, + ): DefaultAddressBookComponent + } +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/DefaultAddressBookFeatureToggles.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/common/DefaultAddressBookFeatureToggles.kt similarity index 78% rename from features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/DefaultAddressBookFeatureToggles.kt rename to features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/common/DefaultAddressBookFeatureToggles.kt index 08247d086c..c3ddb2f1b9 100644 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/DefaultAddressBookFeatureToggles.kt +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/common/DefaultAddressBookFeatureToggles.kt @@ -1,7 +1,8 @@ -package com.tangem.features.addressbook +package com.tangem.features.addressbook.common import com.tangem.core.configtoggle.FeatureToggles import com.tangem.core.configtoggle.feature.FeatureTogglesManager +import com.tangem.features.addressbook.AddressBookFeatureToggles internal class DefaultAddressBookFeatureToggles( private val featureTogglesManager: FeatureTogglesManager, diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/common/DefaultContactSelectionTrigger.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/common/DefaultContactSelectionTrigger.kt new file mode 100644 index 0000000000..115b418695 --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/common/DefaultContactSelectionTrigger.kt @@ -0,0 +1,34 @@ +package com.tangem.features.addressbook.common + +import com.tangem.features.addressbook.ContactSelectionListener +import com.tangem.features.addressbook.ContactSelectionTrigger +import com.tangem.features.addressbook.SelectedContact +import kotlinx.coroutines.channels.BufferOverflow +import kotlinx.coroutines.flow.MutableSharedFlow +import kotlinx.coroutines.flow.SharedFlow +import javax.inject.Inject +import javax.inject.Singleton + +/** + * One-shot delivery of a contact picked on the full address-book list back to the Send flow. + * + * Implements both [ContactSelectionTrigger] (the list emits) and [ContactSelectionListener] (Send collects). The flow + * is no-replay with a 1-item buffer so [trigger] is non-blocking ([tryEmit]) — the picker can always close even if the + * collector is momentarily absent; nothing is retained for late subscribers, so there is no stale value to clear. + */ +@Singleton +internal class DefaultContactSelectionTrigger @Inject constructor() : + ContactSelectionTrigger, + ContactSelectionListener { + + private val mutableResultFlow = MutableSharedFlow( + extraBufferCapacity = 1, + onBufferOverflow = BufferOverflow.DROP_OLDEST, + ) + + override val resultFlow: SharedFlow = mutableResultFlow + + override fun trigger(contact: SelectedContact) { + mutableResultFlow.tryEmit(contact) + } +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/common/ui/ContactRow.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/common/ui/ContactRow.kt new file mode 100644 index 0000000000..20855e8bb0 --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/common/ui/ContactRow.kt @@ -0,0 +1,65 @@ +package com.tangem.features.addressbook.common.ui + +import androidx.compose.runtime.Composable +import androidx.compose.ui.tooling.preview.Preview +import com.tangem.common.ui.account.AccountIcon +import com.tangem.common.ui.account.AccountIconUM +import com.tangem.core.ui.R +import com.tangem.core.ui.components.account.AccountIconSize +import com.tangem.core.ui.ds2.row.* +import com.tangem.core.ui.extensions.pluralStringResourceSafe +import com.tangem.core.ui.extensions.stringReference +import com.tangem.core.ui.res.TangemThemePreviewRedesign +import com.tangem.domain.models.account.CryptoPortfolioIcon +import com.tangem.features.addressbook.list.ui.state.ContactUM + +@Composable +internal fun ContactRow(contact: ContactUM) { + TangemRow( + onClick = contact.onClick, + verticalAlignment = TangemRowVerticalAlignment.Center, + contentLead = TangemRowContentLead.Start, + startSlot = { + AccountIcon( + name = stringReference(contact.name), + icon = contact.icon, + size = AccountIconSize.Contact, + ) + }, + titleSlot = { + TangemRowText( + text = contact.name, + role = TangemRowTextRole.Title, + ) + }, + subtitleSlot = { + TangemRowText( + text = pluralStringResourceSafe( + R.plurals.address_book_addresses, + contact.networkAddressCount, + contact.networkAddressCount, + ), + role = TangemRowTextRole.Subtitle, + ) + }, + ) +} + +@Composable +@Preview(showBackground = true, widthDp = 360) +private fun Preview_ContactRow() { + TangemThemePreviewRedesign { + ContactRow( + ContactUM( + id = "1", + name = "Binance", + icon = AccountIconUM.CryptoPortfolio( + value = CryptoPortfolioIcon.Icon.Letter, + color = CryptoPortfolioIcon.Color.Azure, + ), + networkAddressCount = 1, + onClick = {}, + ), + ) + } +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/component/AddressBookRoute.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/component/AddressBookRoute.kt deleted file mode 100644 index 815ebd2498..0000000000 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/component/AddressBookRoute.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.tangem.features.addressbook.component - -import kotlinx.serialization.Serializable - -@Serializable -internal sealed class AddressBookRoute { - - @Serializable - data object List : AddressBookRoute() - - /** - * if [contactId] is not null we should fetch existing contact - */ - @Serializable - data class EditContact( - val contactId: String? = null, - ) : AddressBookRoute() - - @Serializable - data object AddAddress : AddressBookRoute() -} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/component/DefaultAddressBookComponent.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/component/DefaultAddressBookComponent.kt deleted file mode 100644 index e843ffd769..0000000000 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/component/DefaultAddressBookComponent.kt +++ /dev/null @@ -1,108 +0,0 @@ -package com.tangem.features.addressbook.component - -import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.ui.Modifier -import com.arkivanov.decompose.ComponentContext -import com.arkivanov.decompose.extensions.compose.stack.Children -import com.arkivanov.decompose.extensions.compose.stack.animation.stackAnimation -import com.arkivanov.decompose.extensions.compose.subscribeAsState -import com.arkivanov.decompose.router.stack.StackNavigation -import com.arkivanov.decompose.router.stack.childStack -import com.arkivanov.decompose.router.stack.pop -import com.arkivanov.decompose.router.stack.pushNew -import com.tangem.core.decompose.context.AppComponentContext -import com.tangem.core.decompose.context.childByContext -import com.tangem.core.ui.decompose.ComposableContentComponent -import com.tangem.domain.addressbook.model.ContactId -import com.tangem.features.addressbook.AddressBookComponent -import com.tangem.features.addressbook.addaddress.AddAddressComponent -import com.tangem.features.addressbook.editcontact.EditContactComponent -import com.tangem.features.addressbook.editcontact.contract.ValidatedAddress -import com.tangem.features.addressbook.list.AddressBookListComponent -import dagger.assisted.Assisted -import dagger.assisted.AssistedFactory -import dagger.assisted.AssistedInject - -internal class DefaultAddressBookComponent @AssistedInject constructor( - @Assisted context: AppComponentContext, - @Assisted private val params: AddressBookComponent.Params, - private val addressBookListComponentFactory: AddressBookListComponent.Factory, - private val editContactComponentFactory: EditContactComponent.Factory, - private val addAddressComponentFactory: AddAddressComponent.Factory, -) : AddressBookComponent, AppComponentContext by context { - - private val navigation = StackNavigation() - - /** - * Consumer for the address entered on the [AddressBookRoute.AddAddress] screen, registered by the EditContact - * screen when it requests adding an address and invoked when AddAddress confirms. Transient by design — the - * entered addresses live only in EditContact's in-memory state until the contact is saved. - */ - private var pendingAddressSink: ((ValidatedAddress) -> Unit)? = null - - private val contentStack = childStack( - key = "address_book_stack", - source = navigation, - serializer = AddressBookRoute.serializer(), - initialConfiguration = AddressBookRoute.List, - handleBackButton = false, - childFactory = ::screenChild, - ) - - @Suppress("ReusedModifierInstance") - @Composable - override fun Content(modifier: Modifier) { - val childStack by contentStack.subscribeAsState() - - Children(stack = childStack, animation = stackAnimation()) { child -> - child.instance.Content(modifier = modifier) - } - } - - private fun screenChild(config: AddressBookRoute, componentContext: ComponentContext): ComposableContentComponent = - when (config) { - AddressBookRoute.List -> addressBookListComponentFactory.create( - context = childByContext(componentContext), - params = AddressBookListComponent.Params( - onContactClick = { contactId -> - navigation.pushNew(AddressBookRoute.EditContact(contactId)) - }, - onAddContactClick = { navigation.pushNew(AddressBookRoute.EditContact()) }, - ), - ) - is AddressBookRoute.EditContact -> editContactComponentFactory.create( - context = childByContext(componentContext), - params = EditContactComponent.Params( - contactId = config.contactId?.let(::ContactId), - onBackClick = { navigation.pop() }, - onAddAddressClick = { onResult -> - pendingAddressSink = onResult - navigation.pushNew(AddressBookRoute.AddAddress) - }, - ), - ) - AddressBookRoute.AddAddress -> addAddressComponentFactory.create( - context = childByContext(componentContext), - params = AddAddressComponent.Params( - onBackClick = { - pendingAddressSink = null - navigation.pop() - }, - onConfirm = { address -> - pendingAddressSink?.invoke(address) - pendingAddressSink = null - navigation.pop() - }, - ), - ) - } - - @AssistedFactory - interface Factory : AddressBookComponent.Factory { - override fun create( - context: AppComponentContext, - params: AddressBookComponent.Params, - ): DefaultAddressBookComponent - } -} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/di/AddressBookComponentModule.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/di/AddressBookComponentModule.kt index 493422e7c2..30378a73a6 100644 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/di/AddressBookComponentModule.kt +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/di/AddressBookComponentModule.kt @@ -1,13 +1,14 @@ package com.tangem.features.addressbook.di import com.tangem.features.addressbook.AddressBookComponent -import com.tangem.features.addressbook.addaddress.AddAddressComponent -import com.tangem.features.addressbook.addaddress.DefaultAddAddressComponent -import com.tangem.features.addressbook.component.DefaultAddressBookComponent -import com.tangem.features.addressbook.list.AddressBookListComponent -import com.tangem.features.addressbook.list.DefaultAddressBookListComponent -import com.tangem.features.addressbook.editcontact.DefaultEditContactComponent -import com.tangem.features.addressbook.editcontact.EditContactComponent +import com.tangem.features.addressbook.AddressBookContactsBlockComponent +import com.tangem.features.addressbook.AddressSelectorComponent +import com.tangem.features.addressbook.ContactSelectionListener +import com.tangem.features.addressbook.ContactSelectionTrigger +import com.tangem.features.addressbook.addressselector.DefaultAddressSelectorComponent +import com.tangem.features.addressbook.block.DefaultAddressBookContactsBlockComponent +import com.tangem.features.addressbook.common.DefaultAddressBookComponent +import com.tangem.features.addressbook.common.DefaultContactSelectionTrigger import dagger.Binds import dagger.Module import dagger.hilt.InstallIn @@ -24,15 +25,21 @@ internal interface AddressBookComponentModule { @Binds @Singleton - fun bindAddressBookListComponentFactory( - factory: DefaultAddressBookListComponent.Factory, - ): AddressBookListComponent.Factory + fun bindContactsBlockComponentFactory( + factory: DefaultAddressBookContactsBlockComponent.Factory, + ): AddressBookContactsBlockComponent.Factory @Binds @Singleton - fun bindEditContactComponentFactory(factory: DefaultEditContactComponent.Factory): EditContactComponent.Factory + fun bindAddressSelectorComponentFactory( + factory: DefaultAddressSelectorComponent.Factory, + ): AddressSelectorComponent.Factory @Binds @Singleton - fun bindAddAddressComponentFactory(factory: DefaultAddAddressComponent.Factory): AddAddressComponent.Factory + fun bindContactSelectionTrigger(impl: DefaultContactSelectionTrigger): ContactSelectionTrigger + + @Binds + @Singleton + fun bindContactSelectionListener(impl: DefaultContactSelectionTrigger): ContactSelectionListener } \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/di/AddressBookModelModule.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/di/AddressBookModelModule.kt index 8d81fd327a..9b21153da9 100644 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/di/AddressBookModelModule.kt +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/di/AddressBookModelModule.kt @@ -3,6 +3,7 @@ package com.tangem.features.addressbook.di import com.tangem.core.decompose.di.ModelComponent import com.tangem.core.decompose.model.Model import com.tangem.features.addressbook.addaddress.model.AddAddressModel +import com.tangem.features.addressbook.block.model.ContactsBlockModel import com.tangem.features.addressbook.list.model.AddressBookListModel import com.tangem.features.addressbook.editcontact.model.EditContactModel import dagger.Binds @@ -20,6 +21,11 @@ internal interface AddressBookModelModule { @ClassKey(AddressBookListModel::class) fun bindAddressBookModel(model: AddressBookListModel): Model + @Binds + @IntoMap + @ClassKey(ContactsBlockModel::class) + fun bindContactsBlockModel(model: ContactsBlockModel): Model + @Binds @IntoMap @ClassKey(EditContactModel::class) diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/di/AddressBookModule.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/di/AddressBookModule.kt index 4594968b09..3ca882b9ec 100644 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/di/AddressBookModule.kt +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/di/AddressBookModule.kt @@ -2,7 +2,7 @@ package com.tangem.features.addressbook.di import com.tangem.core.configtoggle.feature.FeatureTogglesManager import com.tangem.features.addressbook.AddressBookFeatureToggles -import com.tangem.features.addressbook.DefaultAddressBookFeatureToggles +import com.tangem.features.addressbook.common.DefaultAddressBookFeatureToggles import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/DefaultEditContactComponent.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/DefaultEditContactComponent.kt index 8f83105d52..7fa44a861e 100644 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/DefaultEditContactComponent.kt +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/DefaultEditContactComponent.kt @@ -7,16 +7,16 @@ import androidx.compose.ui.Modifier import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.decompose.model.getOrCreateModel +import com.tangem.core.ui.decompose.ComposableContentComponent +import com.tangem.domain.addressbook.model.ContactId import com.tangem.features.addressbook.editcontact.model.EditContactModel import com.tangem.features.addressbook.editcontact.ui.EditContactContent -import dagger.assisted.Assisted -import dagger.assisted.AssistedFactory -import dagger.assisted.AssistedInject +import com.tangem.features.addressbook.editcontact.ui.state.ValidatedAddress -internal class DefaultEditContactComponent @AssistedInject constructor( - @Assisted context: AppComponentContext, - @Assisted params: EditContactComponent.Params, -) : EditContactComponent, AppComponentContext by context { +internal class DefaultEditContactComponent( + appComponentContext: AppComponentContext, + params: Params, +) : ComposableContentComponent, AppComponentContext by appComponentContext { private val model: EditContactModel = getOrCreateModel(params) @@ -30,11 +30,10 @@ internal class DefaultEditContactComponent @AssistedInject constructor( BackHandler(onBack = state.onCloseClick) } - @AssistedFactory - interface Factory : EditContactComponent.Factory { - override fun create( - context: AppComponentContext, - params: EditContactComponent.Params, - ): DefaultEditContactComponent - } + data class Params( + val contactId: ContactId?, + val predefinedAddress: ValidatedAddress? = null, + val onBackClick: () -> Unit, + val onAddAddressClick: () -> Unit, + ) } \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/EditContactComponent.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/EditContactComponent.kt deleted file mode 100644 index 2e93f5ff24..0000000000 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/EditContactComponent.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.tangem.features.addressbook.editcontact - -import com.tangem.core.decompose.factory.ComponentFactory -import com.tangem.core.ui.decompose.ComposableContentComponent -import com.tangem.domain.addressbook.model.ContactId -import com.tangem.features.addressbook.editcontact.contract.ValidatedAddress - -internal interface EditContactComponent : ComposableContentComponent { - - interface Factory : ComponentFactory - - data class Params( - val contactId: ContactId?, - val onBackClick: () -> Unit, - val onAddAddressClick: (onResult: (ValidatedAddress) -> Unit) -> Unit, - ) -} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/contract/ValidatedAddress.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/contract/ValidatedAddress.kt deleted file mode 100644 index 87a094ee60..0000000000 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/contract/ValidatedAddress.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.tangem.features.addressbook.editcontact.contract - -import com.tangem.domain.models.network.Network - -/** - * A recipient address that has been validated and resolved to a [Network] on the AddAddress screen. - * - * This is the in-progress (pre-save) representation accumulated in [EditContactUM]. It is converted to a domain - * `AddressEntry` only when the contact is persisted, since the entry's id and signature are produced at save time. - */ -data class ValidatedAddress( - val address: String, - val network: Network, -) \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/model/EditContactModel.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/model/EditContactModel.kt index d4bcdf27ab..90f414fabf 100644 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/model/EditContactModel.kt +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/model/EditContactModel.kt @@ -1,80 +1,79 @@ package com.tangem.features.addressbook.editcontact.model -import com.tangem.common.ui.account.AccountIconUM import com.tangem.core.decompose.di.ModelScoped import com.tangem.core.decompose.model.Model import com.tangem.core.decompose.model.ParamsContainer -import com.tangem.core.ui.R -import com.tangem.core.ui.extensions.resourceReference import com.tangem.domain.models.account.CryptoPortfolioIcon -import com.tangem.features.addressbook.editcontact.EditContactComponent -import com.tangem.features.addressbook.editcontact.contract.EditContactUM -import com.tangem.features.addressbook.editcontact.contract.ValidatedAddress +import com.tangem.features.addressbook.common.AddressBookResultHolder +import com.tangem.features.addressbook.editcontact.DefaultEditContactComponent +import com.tangem.features.addressbook.editcontact.state.EditContactStateController +import com.tangem.features.addressbook.editcontact.state.transformers.AddValidatedAddressTransformer +import com.tangem.features.addressbook.editcontact.state.transformers.SelectContactColorTransformer +import com.tangem.features.addressbook.editcontact.state.transformers.UpdateContactNameTransformer +import com.tangem.features.addressbook.editcontact.state.transformers.UpdateEditContactInitialStateTransformer +import com.tangem.features.addressbook.editcontact.ui.state.EditContactUM +import com.tangem.features.addressbook.editcontact.ui.state.ValidatedAddress import com.tangem.utils.coroutines.CoroutineDispatcherProvider -import kotlinx.collections.immutable.persistentListOf -import kotlinx.collections.immutable.toImmutableList -import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.update +import kotlinx.coroutines.flow.filterNotNull +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach import javax.inject.Inject @ModelScoped internal class EditContactModel @Inject constructor( paramsContainer: ParamsContainer, override val dispatchers: CoroutineDispatcherProvider, + private val stateController: EditContactStateController, + private val resultHolder: AddressBookResultHolder, ) : Model() { - private val params: EditContactComponent.Params = paramsContainer.require() + private val params: DefaultEditContactComponent.Params = paramsContainer.require() - val state: StateFlow - field = MutableStateFlow(getInitialState()) + val state: StateFlow get() = stateController.uiState + + init { + updateInitialState() + prefillPredefinedAddress() + subscribeToConfirmedAddresses() + } + + /** In WithContactCreation mode the contact opens with the already-known address attached. */ + private fun prefillPredefinedAddress() { + params.predefinedAddress?.let(::addAddress) + } + + private fun updateInitialState() { + stateController.update( + UpdateEditContactInitialStateTransformer( + isExistingContact = params.contactId != null, + onNameChange = ::onNameChange, + onColorSelect = ::onColorSelect, + onCloseClick = params.onBackClick, + onAddAddressClick = params.onAddAddressClick, + ), + ) + } + + private fun subscribeToConfirmedAddresses() { + resultHolder.confirmedAddress + .filterNotNull() + .onEach { address -> + addAddress(address) + resultHolder.clear() + } + .launchIn(modelScope) + } private fun onNameChange(name: String) { - state.update { it.copy(name = name) } + stateController.update(UpdateContactNameTransformer(name = name)) } private fun onColorSelect(color: CryptoPortfolioIcon.Color) { - state.update { oldState -> - oldState.copy( - colors = oldState.colors.copy(selected = color), - portfolioIcon = oldState.portfolioIcon.copy(color = color), - ) - } - } - - private fun requestAddAddress() { - params.onAddAddressClick(::addAddress) + stateController.update(SelectContactColorTransformer(color = color)) } private fun addAddress(address: ValidatedAddress) { - state.update { it.copy(addresses = (it.addresses + address).toImmutableList()) } - } - - private fun getInitialState(): EditContactUM { - val colors = CryptoPortfolioIcon.Color.entries.toImmutableList() - val selectedColor = colors.first() - val titleResId = if (params.contactId == null) { - R.string.address_book_new_contact - } else { - R.string.address_book_contact - } - return EditContactUM( - title = resourceReference(titleResId), - name = "", - namePlaceholder = resourceReference(R.string.address_book_new_contact), - portfolioIcon = AccountIconUM.CryptoPortfolio( - value = CryptoPortfolioIcon.Icon.Letter, - color = selectedColor, - ), - colors = EditContactUM.Colors( - selected = selectedColor, - list = colors, - onColorSelect = ::onColorSelect, - ), - addresses = persistentListOf(), - onNameChange = ::onNameChange, - onCloseClick = params.onBackClick, - onAddAddressClick = ::requestAddAddress, - ) + stateController.update(AddValidatedAddressTransformer(address = address)) } } \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/state/EditContactStateController.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/state/EditContactStateController.kt new file mode 100644 index 0000000000..bd75ec37da --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/state/EditContactStateController.kt @@ -0,0 +1,50 @@ +package com.tangem.features.addressbook.editcontact.state + +import com.tangem.common.ui.account.AccountIconUM +import com.tangem.core.decompose.di.ModelScoped +import com.tangem.core.ui.R +import com.tangem.core.ui.extensions.TextReference +import com.tangem.core.ui.extensions.resourceReference +import com.tangem.domain.models.account.CryptoPortfolioIcon +import com.tangem.features.addressbook.editcontact.ui.state.EditContactUM +import com.tangem.utils.transformer.Transformer +import kotlinx.collections.immutable.persistentListOf +import kotlinx.collections.immutable.toImmutableList +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.update +import javax.inject.Inject + +@ModelScoped +internal class EditContactStateController @Inject constructor() { + + val uiState: StateFlow + field = MutableStateFlow(value = getInitialState()) + + fun update(transformer: Transformer) { + uiState.update(function = transformer::transform) + } + + private fun getInitialState(): EditContactUM { + val colors = CryptoPortfolioIcon.Color.entries.toImmutableList() + val selectedColor = colors.first() + return EditContactUM( + title = TextReference.EMPTY, + name = "", + namePlaceholder = resourceReference(R.string.address_book_new_contact), + portfolioIcon = AccountIconUM.CryptoPortfolio( + value = CryptoPortfolioIcon.Icon.Letter, + color = selectedColor, + ), + colors = EditContactUM.Colors( + selected = selectedColor, + list = colors, + onColorSelect = {}, + ), + addresses = persistentListOf(), + onNameChange = {}, + onCloseClick = {}, + onAddAddressClick = {}, + ) + } +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/state/transformers/AddValidatedAddressTransformer.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/state/transformers/AddValidatedAddressTransformer.kt new file mode 100644 index 0000000000..232b07210f --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/state/transformers/AddValidatedAddressTransformer.kt @@ -0,0 +1,19 @@ +package com.tangem.features.addressbook.editcontact.state.transformers + +import com.tangem.features.addressbook.editcontact.ui.state.EditContactUM +import com.tangem.features.addressbook.editcontact.ui.state.ValidatedAddress +import com.tangem.utils.transformer.Transformer +import kotlinx.collections.immutable.toImmutableList + +internal class AddValidatedAddressTransformer( + private val address: ValidatedAddress, +) : Transformer { + + override fun transform(prevState: EditContactUM): EditContactUM { + // Skip duplicates: an address is identified by its string value (it already carries all its networks). + if (prevState.addresses.any { it.address == address.address }) return prevState + return prevState.copy( + addresses = (prevState.addresses + address).toImmutableList(), + ) + } +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/state/transformers/SelectContactColorTransformer.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/state/transformers/SelectContactColorTransformer.kt new file mode 100644 index 0000000000..fa2e4a0572 --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/state/transformers/SelectContactColorTransformer.kt @@ -0,0 +1,17 @@ +package com.tangem.features.addressbook.editcontact.state.transformers + +import com.tangem.domain.models.account.CryptoPortfolioIcon +import com.tangem.features.addressbook.editcontact.ui.state.EditContactUM +import com.tangem.utils.transformer.Transformer + +internal class SelectContactColorTransformer( + private val color: CryptoPortfolioIcon.Color, +) : Transformer { + + override fun transform(prevState: EditContactUM): EditContactUM { + return prevState.copy( + colors = prevState.colors.copy(selected = color), + portfolioIcon = prevState.portfolioIcon.copy(color = color), + ) + } +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/state/transformers/UpdateContactNameTransformer.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/state/transformers/UpdateContactNameTransformer.kt new file mode 100644 index 0000000000..8b61afce92 --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/state/transformers/UpdateContactNameTransformer.kt @@ -0,0 +1,13 @@ +package com.tangem.features.addressbook.editcontact.state.transformers + +import com.tangem.features.addressbook.editcontact.ui.state.EditContactUM +import com.tangem.utils.transformer.Transformer + +internal class UpdateContactNameTransformer( + private val name: String, +) : Transformer { + + override fun transform(prevState: EditContactUM): EditContactUM { + return prevState.copy(name = name) + } +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/state/transformers/UpdateEditContactInitialStateTransformer.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/state/transformers/UpdateEditContactInitialStateTransformer.kt new file mode 100644 index 0000000000..26d8bdd3c8 --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/state/transformers/UpdateEditContactInitialStateTransformer.kt @@ -0,0 +1,35 @@ +package com.tangem.features.addressbook.editcontact.state.transformers + +import com.tangem.core.ui.R +import com.tangem.core.ui.extensions.resourceReference +import com.tangem.domain.models.account.CryptoPortfolioIcon +import com.tangem.features.addressbook.editcontact.ui.state.EditContactUM +import com.tangem.utils.transformer.Transformer + +/** + * Wires the title (derived from whether an existing contact is being edited) and the callbacks owned by + * [com.tangem.features.addressbook.editcontact.model.EditContactModel] into the initial state. + */ +internal class UpdateEditContactInitialStateTransformer( + private val isExistingContact: Boolean, + private val onNameChange: (String) -> Unit, + private val onColorSelect: (CryptoPortfolioIcon.Color) -> Unit, + private val onCloseClick: () -> Unit, + private val onAddAddressClick: () -> Unit, +) : Transformer { + + override fun transform(prevState: EditContactUM): EditContactUM { + val titleResId = if (isExistingContact) { + R.string.address_book_contact + } else { + R.string.address_book_new_contact + } + return prevState.copy( + title = resourceReference(titleResId), + colors = prevState.colors.copy(onColorSelect = onColorSelect), + onNameChange = onNameChange, + onCloseClick = onCloseClick, + onAddAddressClick = onAddAddressClick, + ) + } +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/ui/EditContactContent.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/ui/EditContactContent.kt index e6d2f4a0ab..c45223210c 100644 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/ui/EditContactContent.kt +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/ui/EditContactContent.kt @@ -1,20 +1,16 @@ package com.tangem.features.addressbook.editcontact.ui import android.content.res.Configuration -import androidx.compose.foundation.background -import androidx.compose.foundation.border -import androidx.compose.foundation.clickable +import androidx.compose.foundation.* import androidx.compose.foundation.layout.* import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.res.vectorResource +import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.util.fastForEach @@ -22,19 +18,27 @@ import com.tangem.common.ui.account.AccountIcon import com.tangem.common.ui.account.AccountIconUM import com.tangem.common.ui.account.getUiColor import com.tangem.core.ui.R +import com.tangem.core.ui.components.SpacerH import com.tangem.core.ui.components.account.AccountIconSize +import com.tangem.core.ui.components.block.BlockCard +import com.tangem.core.ui.components.block.TangemBlockCardColors import com.tangem.core.ui.components.fields.AutoSizeTextField +import com.tangem.core.ui.ds.image.TangemIcon import com.tangem.core.ui.ds.image.TangemIconUM import com.tangem.core.ui.ds.topbar.TangemTopBar import com.tangem.core.ui.ds2.button.TangemButton -import com.tangem.core.ui.extensions.resolveReference -import com.tangem.core.ui.extensions.stringReference -import com.tangem.core.ui.extensions.stringResourceSafe +import com.tangem.core.ui.ds2.row.TangemRow +import com.tangem.core.ui.ds2.row.TangemRowText +import com.tangem.core.ui.ds2.row.TangemRowTextRole +import com.tangem.core.ui.ds2.row.TangemRowVerticalAlignment +import com.tangem.core.ui.extensions.* import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreviewRedesign +import com.tangem.core.ui.res.generated.icons.Icons +import com.tangem.core.ui.res.generated.icons.ic_sign_plus_20 import com.tangem.domain.models.account.CryptoPortfolioIcon -import com.tangem.features.addressbook.editcontact.contract.EditContactUM -import com.tangem.features.addressbook.editcontact.contract.ValidatedAddress +import com.tangem.features.addressbook.editcontact.ui.state.EditContactUM +import com.tangem.features.addressbook.editcontact.ui.state.ValidatedAddress import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.toImmutableList @@ -63,118 +67,126 @@ internal fun EditContactContent(state: EditContactUM, modifier: Modifier = Modif Column( modifier = Modifier - .padding(horizontal = 16.dp) - .weight(1f), - verticalArrangement = Arrangement.spacedBy(12.dp), + .fillMaxWidth() + .verticalScroll(rememberScrollState()) + .padding(horizontal = 16.dp, vertical = 12.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), ) { ContactSummary(state = state) ContactColor(colors = state.colors) - ContactAddresses(addresses = state.addresses) - AddAddressRow(onClick = state.onAddAddressClick) - } - } -} - -@Composable -private fun ContactAddresses(addresses: ImmutableList) { - if (addresses.isEmpty()) return - Column( - modifier = Modifier - .clip(RoundedCornerShape(16.dp)) - .fillMaxWidth() - .background(TangemTheme.colors3.bg.secondary), - ) { - addresses.fastForEach { entry -> - Column( - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 12.dp, vertical = 12.dp), - verticalArrangement = Arrangement.spacedBy(2.dp), + BlockCard( + shape = RoundedCornerShape(24.dp), + colors = TangemBlockCardColors.copy(containerColor = TangemTheme.colors3.bg.secondary), ) { - Text( - text = entry.network.name, - style = TangemTheme.typography3.caption.medium, - color = TangemTheme.colors3.text.tertiary, - ) - Text( - text = entry.address, - style = TangemTheme.typography3.body.medium, - color = TangemTheme.colors3.text.primary, - maxLines = 1, - ) + ContactAddresses(addresses = state.addresses) + AddAddressRow(onClick = state.onAddAddressClick) } } } } @Composable -private fun AddAddressRow(onClick: () -> Unit) { - Row( - modifier = Modifier - .clip(RoundedCornerShape(16.dp)) - .fillMaxWidth() - .background(TangemTheme.colors3.bg.secondary) - .clickable(onClick = onClick) - .padding(horizontal = 12.dp, vertical = 15.dp), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(12.dp), - ) { - Box( - contentAlignment = Alignment.Center, - modifier = Modifier - .size(36.dp) - .clip(CircleShape) - .background(TangemTheme.colors3.bg.status.infoSubtle), - ) { - Icon( - modifier = Modifier.size(18.dp), - imageVector = ImageVector.vectorResource(R.drawable.ic_plus_24), - tint = TangemTheme.colors3.text.status.info, - contentDescription = null, - ) - } - Column( - verticalArrangement = Arrangement.spacedBy(2.dp), - ) { - Text( - text = stringResourceSafe(R.string.address_book_add_address), - style = TangemTheme.typography3.body.medium, - color = TangemTheme.colors3.text.primary, - ) - Text( - text = stringResourceSafe(R.string.address_book_add_address_description), - style = TangemTheme.typography3.caption.medium, - color = TangemTheme.colors3.text.tertiary, - ) - } +private fun ContactAddresses(addresses: ImmutableList) { + addresses.fastForEach { entry -> + AddressRow(entry = entry) } } +@Composable +private fun AddressRow(entry: ValidatedAddress) { + TangemRow( + verticalAlignment = TangemRowVerticalAlignment.Center, + startSlot = { + TangemIcon( + tangemIconUM = TangemIconUM.Ident(text = entry.address), + modifier = Modifier + .size(40.dp) + .clip(CircleShape), + ) + }, + titleSlot = { + TangemRowText( + text = stringReference(entry.address), + role = TangemRowTextRole.Title, + overflow = TextOverflow.MiddleEllipsis, + ) + }, + subtitleSlot = { + TangemRowText( + text = pluralReference( + id = R.plurals.common_networks_count, + count = entry.networkIds.size, + formatArgs = wrappedList(entry.networkIds.size), + ), + role = TangemRowTextRole.Subtitle, + ) + }, + ) +} + +@Composable +private fun AddAddressRow(onClick: () -> Unit) { + TangemRow( + verticalAlignment = TangemRowVerticalAlignment.Center, + onClick = onClick, + startSlot = { + TangemIcon( + tangemIconUM = TangemIconUM.Icon( + imageVector = Icons.ic_sign_plus_20, + tintReference = { TangemTheme.colors3.icon.brand }, + ), + modifier = Modifier + .size(40.dp) + .background( + color = TangemTheme.colors3.bg.status.infoSubtle, + shape = RoundedCornerShape(10.dp), + ) + .padding(8.dp), + ) + }, + titleSlot = { + TangemRowText( + text = TextReference.Res(R.string.address_book_add_address), + role = TangemRowTextRole.Title, + ) + }, + subtitleSlot = { + TangemRowText( + text = TextReference.Res(R.string.address_book_add_address_description), + role = TangemRowTextRole.Subtitle, + ) + }, + ) +} + @Composable private fun ContactSummary(state: EditContactUM) { val avatarName = state.name.ifBlank { state.namePlaceholder.resolveReference() } Column( modifier = Modifier - .clip(RoundedCornerShape(16.dp)) + .clip(RoundedCornerShape(24.dp)) .fillMaxWidth() - .background(TangemTheme.colors3.bg.secondary), + .background(TangemTheme.colors3.bg.secondary) + .padding(16.dp), horizontalAlignment = Alignment.CenterHorizontally, ) { - Spacer(modifier = Modifier.height(24.dp)) + SpacerH(20.dp) AccountIcon( name = stringReference(avatarName), icon = state.portfolioIcon, - size = AccountIconSize.Large, + size = AccountIconSize.RedesignLarge, ) - Spacer(modifier = Modifier.height(24.dp)) + + SpacerH(28.dp) Text( text = stringResourceSafe(R.string.address_book_contact_name), style = TangemTheme.typography3.caption.medium, - color = TangemTheme.colors3.text.tertiary, + color = TangemTheme.colors3.text.secondary, ) - Spacer(modifier = Modifier.height(2.dp)) + + SpacerH(4.dp) AutoSizeTextField( value = state.name, @@ -186,7 +198,7 @@ private fun ContactSummary(state: EditContactUM) { color = TangemTheme.colors3.text.primary, placeholderColor = TangemTheme.colors3.text.tertiary, ) - Spacer(modifier = Modifier.height(20.dp)) + SpacerH(8.dp) } } @@ -196,16 +208,16 @@ private fun ContactSummary(state: EditContactUM) { private fun ContactColor(colors: EditContactUM.Colors) { Box( modifier = Modifier - .clip(RoundedCornerShape(16.dp)) + .clip(RoundedCornerShape(24.dp)) .fillMaxWidth() - .background(TangemTheme.colors3.bg.secondary), + .background(TangemTheme.colors3.bg.secondary) + .padding(16.dp), ) { FlowRow( maxItemsInEachRow = 6, - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 8.dp, vertical = 12.dp), - horizontalArrangement = Arrangement.spacedBy(4.dp, Alignment.CenterHorizontally), + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalArrangement = Arrangement.spacedBy(18.dp), ) { colors.list.fastForEach { color -> val isSelected = color == colors.selected @@ -219,12 +231,12 @@ private fun ContactColor(colors: EditContactUM.Colors) { if (isSelected) { Box( modifier = Modifier - .size(47.dp) + .size(48.dp) .border(2.dp, color.getUiColor(), shape = CircleShape), ) Box( modifier = Modifier - .size(36.dp) + .size(38.dp) .background(color = color.getUiColor(), shape = CircleShape), ) } else { @@ -260,7 +272,12 @@ private fun Preview_EditContactContent() { list = colors, onColorSelect = {}, ), - addresses = persistentListOf(), + addresses = persistentListOf( + ValidatedAddress( + address = "0x1234567890abcdef1234567890abcdef12345678", + networkIds = persistentListOf("ethereum", "bsc", "polygon"), + ), + ), onNameChange = {}, onCloseClick = {}, onAddAddressClick = {}, diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/contract/EditContactUM.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/ui/state/EditContactUM.kt similarity index 87% rename from features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/contract/EditContactUM.kt rename to features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/ui/state/EditContactUM.kt index 9efd8db0e2..55793600ad 100644 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/contract/EditContactUM.kt +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/ui/state/EditContactUM.kt @@ -1,10 +1,12 @@ -package com.tangem.features.addressbook.editcontact.contract +package com.tangem.features.addressbook.editcontact.ui.state +import androidx.compose.runtime.Immutable import com.tangem.common.ui.account.AccountIconUM import com.tangem.core.ui.extensions.TextReference import com.tangem.domain.models.account.CryptoPortfolioIcon import kotlinx.collections.immutable.ImmutableList +@Immutable internal data class EditContactUM( val title: TextReference, val name: String, diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/ui/state/ValidatedAddress.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/ui/state/ValidatedAddress.kt new file mode 100644 index 0000000000..8d36e4c6a8 --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/ui/state/ValidatedAddress.kt @@ -0,0 +1,17 @@ +package com.tangem.features.addressbook.editcontact.ui.state + +import androidx.compose.runtime.Immutable +import kotlinx.collections.immutable.ImmutableList + +/** + * A recipient address validated on the AddAddress screen, together with the networks it resolves to. + * + * A single address can belong to several networks (e.g. the same address across EVM chains), so it carries a list of + * [networkIds]. This is the in-progress (pre-save) representation accumulated in [EditContactUM]; the [networkIds] are + * used to rebuild the domain `AddressEntry`s when the contact is persisted. + */ +@Immutable +data class ValidatedAddress( + val address: String, + val networkIds: ImmutableList, +) \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/AddressBookListComponent.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/AddressBookListComponent.kt deleted file mode 100644 index 0072a79d9f..0000000000 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/AddressBookListComponent.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.tangem.features.addressbook.list - -import com.tangem.core.decompose.factory.ComponentFactory -import com.tangem.core.ui.decompose.ComposableContentComponent - -internal interface AddressBookListComponent : ComposableContentComponent { - - interface Factory : ComponentFactory - - data class Params( - val onContactClick: (String) -> Unit, - val onAddContactClick: () -> Unit, - ) -} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/DefaultAddressBookListComponent.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/DefaultAddressBookListComponent.kt index 63733b90f9..4f02d5303e 100644 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/DefaultAddressBookListComponent.kt +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/DefaultAddressBookListComponent.kt @@ -1,43 +1,77 @@ package com.tangem.features.addressbook.list +import androidx.compose.foundation.background import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.arkivanov.decompose.extensions.compose.subscribeAsState +import com.arkivanov.decompose.router.slot.childSlot +import com.arkivanov.decompose.router.slot.dismiss import com.tangem.core.decompose.context.AppComponentContext +import com.tangem.core.decompose.context.childByContext import com.tangem.core.decompose.model.getOrCreateModel -import com.tangem.features.addressbook.list.contract.AddressBookListUM +import com.tangem.core.ui.decompose.ComposableContentComponent +import com.tangem.core.ui.res.TangemTheme +import com.tangem.features.addressbook.AddressSelectorComponent import com.tangem.features.addressbook.list.model.AddressBookListModel import com.tangem.features.addressbook.list.ui.AddressBookEmptyScreen -import dagger.assisted.Assisted -import dagger.assisted.AssistedFactory -import dagger.assisted.AssistedInject +import com.tangem.features.addressbook.list.ui.AddressBookListScreen +import com.tangem.features.addressbook.list.ui.state.AddressBookListUM +import com.tangem.features.addressbook.route.AddressBookRoute -internal class DefaultAddressBookListComponent @AssistedInject constructor( - @Assisted context: AppComponentContext, - @Assisted val params: AddressBookListComponent.Params, -) : AddressBookListComponent, AppComponentContext by context { +internal class DefaultAddressBookListComponent( + appComponentContext: AppComponentContext, + params: Params, + addressSelectorFactory: AddressSelectorComponent.Factory, +) : ComposableContentComponent, AppComponentContext by appComponentContext { private val model: AddressBookListModel = getOrCreateModel(params) + private val selectorSlot = childSlot( + source = model.selectorNavigation, + serializer = null, + key = "address_selector_slot", + handleBackButton = true, + childFactory = { contact, componentContext -> + addressSelectorFactory.create( + context = childByContext(componentContext), + params = AddressSelectorComponent.Params( + contact = contact, + onAddressSelected = model::deliverSelection, + onDismiss = { model.selectorNavigation.dismiss() }, + ), + ) + }, + ) + @Composable override fun Content(modifier: Modifier) { val state by model.state.collectAsStateWithLifecycle() + val selector by selectorSlot.subscribeAsState() when (val addressBookListUM = state) { is AddressBookListUM.Empty -> AddressBookEmptyScreen( - tangemButtonUM = addressBookListUM.tangemButtonUM, + onAddContactClick = addressBookListUM.onAddClick, onBackClick = router::pop, - modifier = modifier, + modifier = modifier.background(TangemTheme.colors3.bg.primary), + ) + is AddressBookListUM.Content -> AddressBookListScreen( + state = addressBookListUM, + onBackClick = router::pop, + modifier = modifier.background(TangemTheme.colors3.bg.primary), ) - is AddressBookListUM.AddressList -> TODO("[REDACTED_TASK_KEY]") } + selector.child?.instance?.BottomSheet() } - @AssistedFactory - interface Factory : AddressBookListComponent.Factory { - override fun create( - context: AppComponentContext, - params: AddressBookListComponent.Params, - ): DefaultAddressBookListComponent - } + /** + * @property mode Default (management) or Selector (pick a contact for a network) + * @property onContactClick management mode — opens the contact editor (TODO [REDACTED_TASK_KEY]) + * @property onAddContactClick opens the new-contact editor + */ + data class Params( + val mode: AddressBookRoute.ListMode, + val onContactClick: (String) -> Unit, + val onAddContactClick: () -> Unit, + ) } \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/contract/AddressBookListUM.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/contract/AddressBookListUM.kt deleted file mode 100644 index 4c0c74bab4..0000000000 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/contract/AddressBookListUM.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.tangem.features.addressbook.list.contract - -import androidx.compose.runtime.Immutable -import com.tangem.core.ui.ds.button.TangemButtonUM -import com.tangem.domain.addressbook.model.Contact -import kotlinx.collections.immutable.ImmutableList - -@Immutable -internal sealed class AddressBookListUM { - - data class Empty( - val tangemButtonUM: TangemButtonUM, - ) : AddressBookListUM() - data class AddressList(val contacts: ImmutableList) : AddressBookListUM() -} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/model/AddressBookListModel.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/model/AddressBookListModel.kt index 27039d82aa..e53a5d03d8 100644 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/model/AddressBookListModel.kt +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/model/AddressBookListModel.kt @@ -1,43 +1,92 @@ package com.tangem.features.addressbook.list.model +import com.arkivanov.decompose.router.slot.SlotNavigation +import com.arkivanov.decompose.router.slot.activate +import com.arkivanov.decompose.router.slot.dismiss import com.tangem.core.decompose.di.ModelScoped import com.tangem.core.decompose.model.Model import com.tangem.core.decompose.model.ParamsContainer -import com.tangem.core.ui.R -import com.tangem.core.ui.R.drawable.ic_plus_24 -import com.tangem.core.ui.ds.button.TangemButtonIconPosition -import com.tangem.core.ui.ds.button.TangemButtonType -import com.tangem.core.ui.ds.button.TangemButtonUM -import com.tangem.core.ui.ds.image.TangemIconUM -import com.tangem.core.ui.extensions.TextReference -import com.tangem.core.ui.res.TangemTheme -import com.tangem.features.addressbook.list.AddressBookListComponent -import com.tangem.features.addressbook.list.contract.AddressBookListUM +import com.tangem.core.decompose.navigation.Router +import com.tangem.domain.addressbook.usecase.GetContactsUseCase +import com.tangem.features.addressbook.ContactSelectionTrigger +import com.tangem.features.addressbook.MatchedContact +import com.tangem.features.addressbook.SelectedContact +import com.tangem.features.addressbook.common.ContactMatcher +import com.tangem.features.addressbook.list.DefaultAddressBookListComponent +import com.tangem.features.addressbook.list.state.AddressBookListStateController +import com.tangem.features.addressbook.list.state.transformers.UpdateAddressBookListInitialStateTransformer +import com.tangem.features.addressbook.list.state.transformers.UpdateAddressBookListSelectionStateTransformer +import com.tangem.features.addressbook.list.ui.state.AddressBookListUM +import com.tangem.features.addressbook.route.AddressBookRoute import com.tangem.utils.coroutines.CoroutineDispatcherProvider -import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach import javax.inject.Inject +/** + * Backs the contacts list. The list content is the same however the address book was opened — the open + * [AddressBookRoute.ListMode] only decides what tapping a contact does: + * - [AddressBookRoute.ListMode.Default]: browse / manage contacts (full UI is TODO [REDACTED_TASK_KEY]). + * - [AddressBookRoute.ListMode.Selector]: pick a recipient for the given network — a single matching address is + * returned right away, several open the address selector first. + */ @ModelScoped internal class AddressBookListModel @Inject constructor( paramsContainer: ParamsContainer, override val dispatchers: CoroutineDispatcherProvider, + private val stateController: AddressBookListStateController, + private val router: Router, + private val contactSelectionTrigger: ContactSelectionTrigger, + private val getContactsUseCase: GetContactsUseCase, ) : Model() { - private val params = paramsContainer.require() + private val params = paramsContainer.require() - val state: StateFlow = MutableStateFlow( - AddressBookListUM.Empty( - tangemButtonUM = TangemButtonUM( - text = TextReference.Res(R.string.address_book_new_contact), - tangemIconUM = TangemIconUM.Icon( - iconRes = ic_plus_24, - tintReference = { TangemTheme.colors3.text.inverse.primary }, - ), - iconPosition = TangemButtonIconPosition.End, - type = TangemButtonType.Primary, - onClick = params.onAddContactClick, - ), - ), - ) + val state: StateFlow get() = stateController.uiState + + /** Address-selector bottom sheet, shown when a picked contact has more than one address in the target network. */ + val selectorNavigation = SlotNavigation() + + init { + when (val mode = params.mode) { + // Browse/manage: full list UI is TODO [REDACTED_TASK_KEY]. + AddressBookRoute.ListMode.Default -> stateController.update( + UpdateAddressBookListInitialStateTransformer(onAddContactClick = params.onAddContactClick), + ) + // Pick a recipient: same list, the tap returns the chosen address. + is AddressBookRoute.ListMode.Selector -> observeSelectionContacts(networkId = mode.networkId) + } + } + + private fun observeSelectionContacts(networkId: String) { + getContactsUseCase(query = "") + .onEach { contacts -> + stateController.update( + UpdateAddressBookListSelectionStateTransformer( + matched = ContactMatcher.match(contacts = contacts, networkId = networkId), + onAddContactClick = params.onAddContactClick, + onContactClick = ::onPickContact, + ), + ) + } + .flowOn(dispatchers.default) + .launchIn(modelScope) + } + + private fun onPickContact(contact: MatchedContact) { + val singleEntry = contact.entries.singleOrNull() + if (singleEntry != null) { + deliverSelection(contact.toSelectedContact(singleEntry)) + } else { + selectorNavigation.activate(contact) + } + } + + fun deliverSelection(contact: SelectedContact) { + contactSelectionTrigger.trigger(contact) + selectorNavigation.dismiss() + router.pop() + } } \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/state/AddressBookListStateController.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/state/AddressBookListStateController.kt new file mode 100644 index 0000000000..8b7799c8f9 --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/state/AddressBookListStateController.kt @@ -0,0 +1,22 @@ +package com.tangem.features.addressbook.list.state + +import com.tangem.core.decompose.di.ModelScoped +import com.tangem.features.addressbook.list.ui.state.AddressBookListUM +import com.tangem.utils.transformer.Transformer +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.update +import javax.inject.Inject + +@ModelScoped +internal class AddressBookListStateController @Inject constructor() { + + val uiState: StateFlow + field = MutableStateFlow(value = getInitialState()) + + fun update(transformer: Transformer) { + uiState.update(function = transformer::transform) + } + + private fun getInitialState(): AddressBookListUM = AddressBookListUM.Empty(onAddClick = {}) +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/state/transformers/UpdateAddressBookListInitialStateTransformer.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/state/transformers/UpdateAddressBookListInitialStateTransformer.kt new file mode 100644 index 0000000000..db17c8e2e3 --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/state/transformers/UpdateAddressBookListInitialStateTransformer.kt @@ -0,0 +1,22 @@ +package com.tangem.features.addressbook.list.state.transformers + +import com.tangem.features.addressbook.list.ui.state.AddressBookListUM +import com.tangem.features.addressbook.list.ui.state.ContentMode +import com.tangem.utils.transformer.Transformer + +/** + * Wires the "add contact" callback owned by the container into the initial (empty) list state. + */ +internal class UpdateAddressBookListInitialStateTransformer( + private val onAddContactClick: () -> Unit, +) : Transformer { + + override fun transform(prevState: AddressBookListUM): AddressBookListUM { + return when (prevState) { + is AddressBookListUM.Empty -> prevState.copy(onAddClick = onAddContactClick) + is AddressBookListUM.Content -> prevState.copy( + contentMode = ContentMode.Default(onAddClick = onAddContactClick), + ) + } + } +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/state/transformers/UpdateAddressBookListSelectionStateTransformer.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/state/transformers/UpdateAddressBookListSelectionStateTransformer.kt new file mode 100644 index 0000000000..fb09fff616 --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/state/transformers/UpdateAddressBookListSelectionStateTransformer.kt @@ -0,0 +1,38 @@ +package com.tangem.features.addressbook.list.state.transformers + +import com.tangem.features.addressbook.MatchedContact +import com.tangem.features.addressbook.list.ui.state.AddressBookListUM +import com.tangem.features.addressbook.list.ui.state.ContactUM +import com.tangem.features.addressbook.list.ui.state.ContentMode +import com.tangem.utils.transformer.Transformer +import kotlinx.collections.immutable.toImmutableList + +/** + * Builds the contacts list from the [matched] contacts. An empty result falls back to [AddressBookListUM.Empty] so the + * user can still add a contact. + */ +internal class UpdateAddressBookListSelectionStateTransformer( + private val matched: List, + private val onAddContactClick: () -> Unit, + private val onContactClick: (MatchedContact) -> Unit, +) : Transformer { + + override fun transform(prevState: AddressBookListUM): AddressBookListUM { + return if (matched.isEmpty()) { + AddressBookListUM.Empty(onAddClick = onAddContactClick) + } else { + AddressBookListUM.Content( + contacts = matched.map { it.toContactUM() }.toImmutableList(), + contentMode = ContentMode.Select, + ) + } + } + + private fun MatchedContact.toContactUM(): ContactUM = ContactUM( + id = contactId, + name = name, + icon = icon, + networkAddressCount = entries.size, + onClick = { onContactClick(this) }, + ) +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/ui/AddressBookEmptyScreen.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/ui/AddressBookEmptyScreen.kt index b1045b5cc2..50a6d9a30d 100644 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/ui/AddressBookEmptyScreen.kt +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/ui/AddressBookEmptyScreen.kt @@ -1,6 +1,5 @@ package com.tangem.features.addressbook.list.ui -import android.content.res.Configuration import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.layout.* @@ -9,26 +8,26 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.res.painterResource +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.tangem.core.ui.R -import com.tangem.core.ui.ds.button.PrimaryTangemButton -import com.tangem.core.ui.ds.button.TangemButtonIconPosition -import com.tangem.core.ui.ds.button.TangemButtonType -import com.tangem.core.ui.ds.button.TangemButtonUM import com.tangem.core.ui.ds.image.TangemIconUM import com.tangem.core.ui.ds.topbar.TangemTopBar import com.tangem.core.ui.ds2.button.TangemButton -import com.tangem.core.ui.extensions.TextReference import com.tangem.core.ui.extensions.resourceReference import com.tangem.core.ui.extensions.stringResourceSafe import com.tangem.core.ui.res.TangemTheme +import com.tangem.core.ui.res.TangemThemePreviewRedesign +import com.tangem.core.ui.res.generated.icons.Icons +import com.tangem.core.ui.res.generated.icons.ic_chevron_left_20 +import com.tangem.core.ui.res.generated.icons.ic_sign_plus_20 @Composable internal fun AddressBookEmptyScreen( - tangemButtonUM: TangemButtonUM, + onAddContactClick: () -> Unit, onBackClick: () -> Unit, modifier: Modifier = Modifier, ) { @@ -41,26 +40,19 @@ internal fun AddressBookEmptyScreen( title = resourceReference(R.string.address_book_title), startContent = { TangemButton( - iconStart = TangemIconUM.Icon(iconRes = R.drawable.ic_back_24), + iconStart = TangemIconUM.Icon(imageVector = Icons.ic_chevron_left_20), onClick = onBackClick, size = TangemButton.Size.X11, variant = TangemButton.Variant.Material, ) }, ) - NoContactInfo() - PrimaryTangemButton( - modifier = Modifier - .fillMaxWidth() - .navigationBarsPadding() - .padding(start = 16.dp, end = 16.dp, bottom = 12.dp), - buttonUM = tangemButtonUM, - ) + NoContactInfo(onAddClick = onAddContactClick) } } @Composable -private fun ColumnScope.NoContactInfo() { +private fun ColumnScope.NoContactInfo(onAddClick: () -> Unit) { Column( modifier = Modifier.weight(1f), verticalArrangement = Arrangement.Center, @@ -68,18 +60,24 @@ private fun ColumnScope.NoContactInfo() { ) { ContactImage() Text( - modifier = Modifier.padding(top = TangemTheme.dimens.spacing24), + modifier = Modifier.padding(top = 32.dp), text = stringResourceSafe(R.string.address_book_no_contacts), color = TangemTheme.colors3.text.primary, - style = TangemTheme.typography3.heading.medium, + style = TangemTheme.typography3.heading.small, ) Text( - modifier = Modifier.padding(top = TangemTheme.dimens.spacing8), + modifier = Modifier.padding(top = 8.dp), text = stringResourceSafe(R.string.address_book_no_contacts_description), color = TangemTheme.colors3.text.secondary, - style = TangemTheme.typography3.body.medium, + style = TangemTheme.typography3.subheading.medium, textAlign = TextAlign.Center, ) + TangemButton( + modifier = Modifier.padding(top = 40.dp), + text = resourceReference(R.string.address_book_add_address), + onClick = onAddClick, + iconEnd = TangemIconUM.Icon(imageVector = Icons.ic_sign_plus_20), + ) } } @@ -95,7 +93,7 @@ private fun ContactImage() { contentAlignment = Alignment.Center, ) { Image( - painter = painterResource(R.drawable.ic_contact_20), + imageVector = ImageVector.vectorResource(R.drawable.ic_address_book_24), contentDescription = stringResourceSafe(R.string.address_book_no_contacts), modifier = Modifier.size(28.dp), ) @@ -104,16 +102,11 @@ private fun ContactImage() { @Composable @Preview(showBackground = true, widthDp = 360) -@Preview(showBackground = true, widthDp = 360, uiMode = Configuration.UI_MODE_NIGHT_YES) private fun Preview_AddressBookEmptyScreen() { - AddressBookEmptyScreen( - tangemButtonUM = TangemButtonUM( - text = TextReference.Res(R.string.address_book_new_contact), - tangemIconUM = TangemIconUM.Icon(iconRes = R.drawable.ic_plus_24), - iconPosition = TangemButtonIconPosition.End, - type = TangemButtonType.Secondary, - onClick = {}, - ), - onBackClick = {}, - ) + TangemThemePreviewRedesign { + AddressBookEmptyScreen( + onAddContactClick = {}, + onBackClick = {}, + ) + } } \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/ui/AddressBookListScreen.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/ui/AddressBookListScreen.kt new file mode 100644 index 0000000000..b338c678e9 --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/ui/AddressBookListScreen.kt @@ -0,0 +1,143 @@ +package com.tangem.features.addressbook.list.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.statusBarsPadding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import com.tangem.common.ui.account.AccountIconUM +import com.tangem.core.ui.R +import com.tangem.core.ui.ds.image.TangemIconUM +import com.tangem.core.ui.ds.topbar.TangemTopBar +import com.tangem.core.ui.ds2.button.TangemButton +import com.tangem.core.ui.extensions.resourceReference +import com.tangem.core.ui.res.TangemThemePreviewRedesign +import com.tangem.core.ui.res.generated.icons.Icons +import com.tangem.core.ui.res.generated.icons.ic_chevron_left_20 +import com.tangem.core.ui.res.generated.icons.ic_cross_20 +import com.tangem.core.ui.res.generated.icons.ic_sign_plus_20 +import com.tangem.domain.models.account.CryptoPortfolioIcon +import com.tangem.features.addressbook.common.ui.ContactRow +import com.tangem.features.addressbook.list.ui.state.AddressBookListUM +import com.tangem.features.addressbook.list.ui.state.ContactUM +import com.tangem.features.addressbook.list.ui.state.ContentMode +import kotlinx.collections.immutable.persistentListOf + +@Composable +internal fun AddressBookListScreen( + state: AddressBookListUM.Content, + onBackClick: () -> Unit, + modifier: Modifier = Modifier, +) { + Column(modifier = modifier) { + TangemTopBar( + modifier = Modifier.statusBarsPadding(), + title = resourceReference(R.string.address_book_title), + startContent = when (state.contentMode) { + is ContentMode.Default -> { + { + TangemButton( + iconStart = TangemIconUM.Icon(imageVector = Icons.ic_chevron_left_20), + onClick = onBackClick, + size = TangemButton.Size.X11, + variant = TangemButton.Variant.Material, + ) + } + } + ContentMode.Select -> null + }, + endContent = { + TangemButton( + iconStart = TangemIconUM.Icon( + imageVector = when (state.contentMode) { + is ContentMode.Default -> Icons.ic_sign_plus_20 + ContentMode.Select -> Icons.ic_cross_20 + }, + ), + onClick = when (state.contentMode) { + is ContentMode.Default -> state.contentMode.onAddClick + ContentMode.Select -> onBackClick + }, + size = TangemButton.Size.X11, + variant = TangemButton.Variant.Material, + ) + }, + ) + LazyColumn(modifier = Modifier.padding(horizontal = 16.dp)) { + items(items = state.contacts, key = ContactUM::id) { contact -> + ContactRow(contact = contact) + } + } + } +} + +@Composable +@Preview(showBackground = true, widthDp = 360) +private fun Preview_AddressBookListScreen() { + TangemThemePreviewRedesign { + Column(verticalArrangement = Arrangement.spacedBy(20.dp)) { + AddressBookListScreen( + state = AddressBookListUM.Content( + contacts = persistentListOf( + ContactUM( + id = "1", + name = "Binance", + icon = AccountIconUM.CryptoPortfolio( + value = CryptoPortfolioIcon.Icon.Letter, + color = CryptoPortfolioIcon.Color.Azure, + ), + networkAddressCount = 1, + onClick = {}, + ), + ContactUM( + id = "2", + name = "Alice", + icon = AccountIconUM.CryptoPortfolio( + value = CryptoPortfolioIcon.Icon.Letter, + color = CryptoPortfolioIcon.Color.UFOGreen, + ), + networkAddressCount = 3, + onClick = {}, + ), + ), + contentMode = ContentMode.Default(onAddClick = {}), + ), + onBackClick = {}, + ) + + AddressBookListScreen( + state = AddressBookListUM.Content( + contacts = persistentListOf( + ContactUM( + id = "1", + name = "Binance", + icon = AccountIconUM.CryptoPortfolio( + value = CryptoPortfolioIcon.Icon.Letter, + color = CryptoPortfolioIcon.Color.Azure, + ), + networkAddressCount = 1, + onClick = {}, + ), + ContactUM( + id = "2", + name = "Alice", + icon = AccountIconUM.CryptoPortfolio( + value = CryptoPortfolioIcon.Icon.Letter, + color = CryptoPortfolioIcon.Color.UFOGreen, + ), + networkAddressCount = 3, + onClick = {}, + ), + ), + contentMode = ContentMode.Select, + ), + onBackClick = {}, + ) + } + } +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/ui/state/AddressBookListUM.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/ui/state/AddressBookListUM.kt new file mode 100644 index 0000000000..f8d7481037 --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/ui/state/AddressBookListUM.kt @@ -0,0 +1,28 @@ +package com.tangem.features.addressbook.list.ui.state + +import androidx.compose.runtime.Immutable +import kotlinx.collections.immutable.ImmutableList + +/** + * UI state of the contacts list. The list itself is the same however the address book was opened — it is either + * [Empty] or shows [Content]. How the address book was opened (browse vs. pick a recipient) only changes what a + * contact tap does, which is captured by [ContactUM.onClick], not by a separate state. + */ +@Immutable +internal sealed interface AddressBookListUM { + + data class Empty(val onAddClick: () -> Unit) : AddressBookListUM + + data class Content( + val contacts: ImmutableList, + val contentMode: ContentMode, + ) : AddressBookListUM +} + +@Immutable +internal sealed interface ContentMode { + + data class Default(val onAddClick: () -> Unit) : ContentMode + + data object Select : ContentMode +} \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/ui/state/ContactUM.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/ui/state/ContactUM.kt new file mode 100644 index 0000000000..d15a700047 --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/list/ui/state/ContactUM.kt @@ -0,0 +1,13 @@ +package com.tangem.features.addressbook.list.ui.state + +import androidx.compose.runtime.Immutable +import com.tangem.common.ui.account.AccountIconUM + +@Immutable +internal data class ContactUM( + val id: String, + val name: String, + val icon: AccountIconUM.CryptoPortfolio, + val networkAddressCount: Int, + val onClick: () -> Unit, +) \ No newline at end of file diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/route/AddressBookRoute.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/route/AddressBookRoute.kt new file mode 100644 index 0000000000..e0a39904b6 --- /dev/null +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/route/AddressBookRoute.kt @@ -0,0 +1,44 @@ +package com.tangem.features.addressbook.route + +import kotlinx.serialization.Serializable + +@Serializable +internal sealed class AddressBookRoute { + + /** + * The contacts list. [mode] mirrors the entry point: [ListMode.Default] for plain browsing/management, and + * [ListMode.Selector] when the list is opened to pick a contact for a given network — a tap then returns the + * chosen address instead of opening the editor. + */ + @Serializable + data class List(val mode: ListMode = ListMode.Default) : AddressBookRoute() + + /** + * if [contactId] is not null we should fetch existing contact. + * + * [predefinedAddress] and [predefinedNetworkId] are set only when the feature is opened in + * [com.tangem.common.routing.entity.AddressBookOpenMode.WithContactCreation] mode — the address and its + * network are already known, so the new contact is opened with that address already attached. + */ + @Serializable + data class EditContact( + val contactId: String? = null, + val predefinedAddress: String? = null, + val predefinedNetworkId: String? = null, + ) : AddressBookRoute() + + @Serializable + data object AddAddress : AddressBookRoute() + + /** How the contacts list is shown — agnostic of which feature opened it. */ + @Serializable + sealed interface ListMode { + + @Serializable + data object Default : ListMode + + /** Pick a contact that has an address in [networkId]. */ + @Serializable + data class Selector(val networkId: String) : ListMode + } +} \ No newline at end of file diff --git a/features/address-book/impl/src/test/kotlin/com/tangem/features/addressbook/addaddress/model/AddAddressModelTest.kt b/features/address-book/impl/src/test/kotlin/com/tangem/features/addressbook/addaddress/model/AddAddressModelTest.kt index c58bb25f8d..cce48d3bbe 100644 --- a/features/address-book/impl/src/test/kotlin/com/tangem/features/addressbook/addaddress/model/AddAddressModelTest.kt +++ b/features/address-book/impl/src/test/kotlin/com/tangem/features/addressbook/addaddress/model/AddAddressModelTest.kt @@ -3,24 +3,23 @@ package com.tangem.features.addressbook.addaddress.model import com.google.common.truth.Truth.assertThat import com.tangem.blockchain.common.Blockchain import com.tangem.common.test.domain.token.MockCryptoCurrencyFactory -import com.tangem.common.ui.extensions.iconResId import com.tangem.core.decompose.model.MutableParamsContainer import com.tangem.core.decompose.model.ParamsContainer +import com.tangem.core.ui.R import com.tangem.core.ui.clipboard.ClipboardManager +import com.tangem.core.ui.extensions.resourceReference import com.tangem.domain.account.models.AccountList import com.tangem.domain.account.supplier.MultiAccountListSupplier import com.tangem.domain.models.account.Account import com.tangem.domain.models.currency.CryptoCurrency -import com.tangem.domain.models.network.Network -import com.tangem.features.addressbook.addaddress.AddAddressComponent -import com.tangem.features.addressbook.addaddress.contract.AddAddressUM -import com.tangem.features.addressbook.editcontact.contract.ValidatedAddress +import com.tangem.features.addressbook.addaddress.DefaultAddAddressComponent +import com.tangem.features.addressbook.addaddress.state.AddAddressStateController +import com.tangem.features.addressbook.editcontact.ui.state.ValidatedAddress import com.tangem.test.mock.MockAccounts import com.tangem.utils.coroutines.TestingCoroutineDispatcherProvider import io.mockk.clearMocks import io.mockk.every import io.mockk.mockk -import kotlinx.collections.immutable.toImmutableList import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.flowOf @@ -28,11 +27,7 @@ import kotlinx.coroutines.test.StandardTestDispatcher import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.advanceUntilIdle import kotlinx.coroutines.test.runTest -import org.junit.jupiter.api.AfterEach -import org.junit.jupiter.api.BeforeEach -import org.junit.jupiter.api.Nested -import org.junit.jupiter.api.Test -import org.junit.jupiter.api.TestInstance +import org.junit.jupiter.api.* @OptIn(ExperimentalCoroutinesApi::class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) @@ -73,7 +68,6 @@ internal class AddAddressModelTest { // Assert assertThat(state.addressField.value).isEmpty() - assertThat(state.addressField.isValuePasted).isFalse() assertThat(state.buttonUM.isEnabled).isFalse() } @@ -87,13 +81,11 @@ internal class AddAddressModelTest { model.state.value.onAddressChange(address) // Assert - val field = model.state.value.addressField - assertThat(field.value).isEqualTo(address) - assertThat(field.isValuePasted).isFalse() + assertThat(model.state.value.addressField.value).isEqualTo(address) } @Test - fun `GIVEN empty field WHEN onPasteClick THEN value marked as pasted`() = runTest { + fun `GIVEN empty field WHEN onPasteClick THEN value taken from clipboard`() = runTest { // Arrange val model = createModel(testScope = this) val address = "0xABC" @@ -103,13 +95,10 @@ internal class AddAddressModelTest { model.state.value.onPasteClick() // Assert - val field = model.state.value.addressField - assertThat(field.value).isEqualTo(address) - assertThat(field.isValuePasted).isTrue() + assertThat(model.state.value.addressField.value).isEqualTo(address) } // validateAndConfirm() is an unimplemented seam — the button click must NOT emit a result yet. - // This guards the foundation and will fail (prompting an update) once validation is wired in. @Test fun `GIVEN typed address WHEN button clicked THEN onConfirm not called yet`() = runTest { // Arrange @@ -127,13 +116,12 @@ internal class AddAddressModelTest { @Nested @TestInstance(TestInstance.Lifecycle.PER_CLASS) - inner class AddressInput { + inner class Validation { @Test - fun `GIVEN coins available WHEN valid address typed THEN matching network chosen`() = runTest { + fun `GIVEN coins available WHEN valid address typed THEN no error AND button enabled`() = runTest { // Arrange - every { multiAccountListSupplier.invoke() } returns - flowOf(listOf(accountListWith(ethereum, bitcoin))) + every { multiAccountListSupplier.invoke() } returns flowOf(listOf(accountListWith(ethereum, bitcoin))) val model = createModel(testScope = this) advanceUntilIdle() @@ -143,16 +131,14 @@ internal class AddAddressModelTest { // Assert val state = model.state.value - assertThat(state.availableNetworks).containsExactly(ethereum.network) - assertThat(state.chosenNetworkStateUM) - .isEqualTo(resultOf(ethereum.network)) + assertThat(state.addressField.isError).isFalse() + assertThat(state.buttonUM.isEnabled).isTrue() } @Test - fun `GIVEN coins available WHEN address matches no network THEN empty state`() = runTest { + fun `GIVEN coins available WHEN address matches no network THEN error AND button disabled`() = runTest { // Arrange - every { multiAccountListSupplier.invoke() } returns - flowOf(listOf(accountListWith(ethereum, bitcoin))) + every { multiAccountListSupplier.invoke() } returns flowOf(listOf(accountListWith(ethereum, bitcoin))) val model = createModel(testScope = this) advanceUntilIdle() @@ -162,31 +148,32 @@ internal class AddAddressModelTest { // Assert val state = model.state.value - assertThat(state.availableNetworks).isEmpty() - assertThat(state.chosenNetworkStateUM).isEqualTo(AddAddressUM.ChosenNetworkStateUM.Empty) + assertThat(state.addressField.isError).isTrue() + assertThat(state.addressField.label) + .isEqualTo(resourceReference(R.string.address_book_invalid_address_error)) + assertThat(state.buttonUM.isEnabled).isFalse() } @Test - fun `GIVEN no coins available WHEN valid address typed THEN empty state`() = runTest { - // Arrange — supplier emits no accounts. - every { multiAccountListSupplier.invoke() } returns flowOf(emptyList()) + fun `GIVEN empty address WHEN validated THEN no error AND button disabled`() = runTest { + // Arrange + every { multiAccountListSupplier.invoke() } returns flowOf(listOf(accountListWith(ethereum))) val model = createModel(testScope = this) advanceUntilIdle() // Act - model.state.value.onAddressChange(VALID_ETH_ADDRESS) + model.state.value.onAddressChange("") advanceUntilIdle() // Assert val state = model.state.value - assertThat(state.availableNetworks).isEmpty() - assertThat(state.chosenNetworkStateUM).isEqualTo(AddAddressUM.ChosenNetworkStateUM.Empty) + assertThat(state.addressField.isError).isFalse() + assertThat(state.buttonUM.isEnabled).isFalse() } - // Covers the "not initialized yet" case: the address is typed before coins load, and the - // chosen network must resolve reactively once the supplier emits them. + // The address is typed before coins load; validity must resolve reactively once the supplier emits them. @Test - fun `GIVEN address typed before coins load WHEN coins emitted THEN network resolved reactively`() = runTest { + fun `GIVEN address typed before coins load WHEN coins emitted THEN validated reactively`() = runTest { // Arrange val accountsFlow = MutableStateFlow>(emptyList()) every { multiAccountListSupplier.invoke() } returns accountsFlow @@ -197,29 +184,19 @@ internal class AddAddressModelTest { model.state.value.onAddressChange(VALID_ETH_ADDRESS) advanceUntilIdle() // Assert intermediate: nothing to match yet - assertThat(model.state.value.chosenNetworkStateUM).isEqualTo(AddAddressUM.ChosenNetworkStateUM.Empty) + assertThat(model.state.value.buttonUM.isEnabled).isFalse() // Act — coins arrive later accountsFlow.value = listOf(accountListWith(ethereum, bitcoin)) advanceUntilIdle() // Assert - assertThat(model.state.value.chosenNetworkStateUM) - .isEqualTo(resultOf(ethereum.network)) + val state = model.state.value + assertThat(state.buttonUM.isEnabled).isTrue() + assertThat(state.addressField.isError).isFalse() } } - private fun resultOf(vararg networks: Network) = AddAddressUM.ChosenNetworkStateUM.Result( - networkUMList = networks - .map { network -> - AddAddressUM.ChosenNetworkStateUM.Result.NetworkUM( - networkName = network.name, - iconResId = network.iconResId, - ) - } - .toImmutableList(), - ) - private fun accountListWith(vararg currencies: CryptoCurrency): AccountList { val walletId = MockAccounts.userWalletId val accounts = listOf( @@ -239,7 +216,7 @@ internal class AddAddressModelTest { private fun createModel( testScope: TestScope, onConfirm: (ValidatedAddress) -> Unit = {}, - params: AddAddressComponent.Params = AddAddressComponent.Params( + params: DefaultAddAddressComponent.Params = DefaultAddAddressComponent.Params( onBackClick = {}, onConfirm = onConfirm, ), @@ -250,6 +227,7 @@ internal class AddAddressModelTest { dispatchers = testScope.createTestingCoroutineDispatcherProvider(), multiAccountListSupplier = multiAccountListSupplier, clipboardManager = clipboardManager, + stateController = AddAddressStateController(), ).also { model = it } } diff --git a/features/address-book/impl/src/test/kotlin/com/tangem/features/addressbook/common/ContactMatcherTest.kt b/features/address-book/impl/src/test/kotlin/com/tangem/features/addressbook/common/ContactMatcherTest.kt new file mode 100644 index 0000000000..2f9974771e --- /dev/null +++ b/features/address-book/impl/src/test/kotlin/com/tangem/features/addressbook/common/ContactMatcherTest.kt @@ -0,0 +1,100 @@ +package com.tangem.features.addressbook.common + +import com.google.common.truth.Truth.assertThat +import com.tangem.domain.addressbook.model.* +import com.tangem.domain.models.account.CryptoPortfolioIcon +import com.tangem.domain.models.network.Network +import com.tangem.domain.models.wallet.UserWalletId +import org.junit.jupiter.api.Test + +internal class ContactMatcherTest { + + @Test + fun `GIVEN contacts WHEN match THEN keeps only contacts with an address in the network`() { + // Arrange + val ethContact = contact("Binance", entry("0xAAA", ETHEREUM), entry("Trx", TRON)) + val tronOnly = contact("Tron Friend", entry("Trx2", TRON)) + + // Act + val result = ContactMatcher.match(listOf(ethContact, tronOnly), networkId = ETHEREUM) + + // Assert + assertThat(result.map { it.name }).containsExactly("Binance") + assertThat(result.single().entries.map { it.address }).containsExactly("0xAAA") + } + + @Test + fun `GIVEN no contact in the network WHEN match THEN returns empty`() { + // Arrange + val tronOnly = contact("Tron Friend", entry("Trx", TRON)) + + // Act + val result = ContactMatcher.match(listOf(tronOnly), networkId = ETHEREUM) + + // Assert + assertThat(result).isEmpty() + } + + @Test + fun `GIVEN contact with multiple addresses in the network WHEN match THEN all those entries are returned`() { + // Arrange + val exchange = contact("Exchange", entry("0xAAA", ETHEREUM, memo = "1"), entry("0xBBB", ETHEREUM)) + + // Act + val result = ContactMatcher.match(listOf(exchange), networkId = ETHEREUM) + + // Assert + val entries = result.single().entries + assertThat(entries.map { it.address }).containsExactly("0xAAA", "0xBBB") + assertThat(entries.first { it.address == "0xAAA" }.memo).isEqualTo("1") + } + + @Test + fun `GIVEN contact with stored color WHEN match THEN avatar color is taken from the contact`() { + // Arrange + val contact = contact("Binance", entry("0xAAA", ETHEREUM), iconColor = "MexicanPink") + + // Act + val result = ContactMatcher.match(listOf(contact), networkId = ETHEREUM) + + // Assert + assertThat(result.single().icon.color).isEqualTo(CryptoPortfolioIcon.Color.MexicanPink) + } + + @Test + fun `GIVEN contact with unknown color WHEN match THEN avatar color falls back to default`() { + // Arrange + val contact = contact("Binance", entry("0xAAA", ETHEREUM), iconColor = "not-a-color") + + // Act + val result = ContactMatcher.match(listOf(contact), networkId = ETHEREUM) + + // Assert + assertThat(result.single().icon.color).isEqualTo(CryptoPortfolioIcon.Color.Azure) + } + + private fun contact(name: String, vararg entries: AddressEntry, iconColor: String = "Azure"): Contact = Contact( + id = ContactId(name), + walletId = UserWalletId(stringValue = "0001"), + name = requireNotNull(ContactName(name).getOrNull()) { "invalid test name" }, + icon = "", + iconColor = iconColor, + createdAt = "2026-06-10T14:30:00.000Z", + updatedAt = "2026-06-10T14:30:00.000Z", + addressEntries = entries.toList(), + ) + + private fun entry(address: String, networkId: String, memo: String? = null): AddressEntry = AddressEntry( + id = AddressEntryId(address), + address = address, + networkId = Network.RawID(networkId), + memo = memo, + signature = "sig", + networkName = "Ethereum", + ) + + private companion object { + const val ETHEREUM = "ethereum" + const val TRON = "tron" + } +} \ No newline at end of file diff --git a/features/address-book/impl/src/test/kotlin/com/tangem/features/addressbook/editcontact/model/EditContactModelTest.kt b/features/address-book/impl/src/test/kotlin/com/tangem/features/addressbook/editcontact/model/EditContactModelTest.kt index ebf9acafd1..cdf098ec82 100644 --- a/features/address-book/impl/src/test/kotlin/com/tangem/features/addressbook/editcontact/model/EditContactModelTest.kt +++ b/features/address-book/impl/src/test/kotlin/com/tangem/features/addressbook/editcontact/model/EditContactModelTest.kt @@ -8,23 +8,36 @@ import com.tangem.core.ui.R import com.tangem.core.ui.extensions.resourceReference import com.tangem.domain.addressbook.model.ContactId import com.tangem.domain.models.account.CryptoPortfolioIcon -import com.tangem.domain.models.network.Network -import com.tangem.features.addressbook.editcontact.EditContactComponent -import com.tangem.features.addressbook.editcontact.contract.EditContactUM -import com.tangem.features.addressbook.editcontact.contract.ValidatedAddress +import com.tangem.features.addressbook.common.AddressBookResultHolder +import com.tangem.features.addressbook.editcontact.DefaultEditContactComponent +import com.tangem.features.addressbook.editcontact.state.EditContactStateController +import com.tangem.features.addressbook.editcontact.ui.state.EditContactUM +import com.tangem.features.addressbook.editcontact.ui.state.ValidatedAddress import com.tangem.utils.coroutines.TestingCoroutineDispatcherProvider -import io.mockk.mockk import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.toImmutableList import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.StandardTestDispatcher import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.advanceUntilIdle import kotlinx.coroutines.test.runTest +import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Test @OptIn(ExperimentalCoroutinesApi::class) internal class EditContactModelTest { + private val resultHolder = AddressBookResultHolder() + + private var model: EditContactModel? = null + + @AfterEach + fun tearDown() { + // Cancels modelScope, stopping the confirmed-addresses collector. + model?.onDestroy() + model = null + } + @Test fun `WHEN model created THEN initial state is correct`() = runTest { val expectedColors = CryptoPortfolioIcon.Color.entries.toImmutableList() @@ -57,11 +70,7 @@ internal class EditContactModelTest { @Test fun `GIVEN existing contactId WHEN model created THEN title is contact`() = runTest { // Arrange - val params = EditContactComponent.Params( - contactId = ContactId(value = "contact-id"), - onBackClick = {}, - onAddAddressClick = {}, - ) + val params = createParams(contactId = ContactId(value = "contact-id")) // Act val model = createModel(testScope = this, params = params) @@ -94,38 +103,73 @@ internal class EditContactModelTest { } @Test - fun `GIVEN add address requested WHEN result delivered THEN address appended to state`() = runTest { + fun `GIVEN confirmed address set on holder WHEN collected THEN address appended to state`() = runTest { // Arrange - var capturedSink: ((ValidatedAddress) -> Unit)? = null - val params = EditContactComponent.Params( - contactId = null, - onBackClick = {}, - onAddAddressClick = { onResult -> capturedSink = onResult }, - ) - val model = createModel(testScope = this, params = params) - val validatedAddress = ValidatedAddress(address = "0xABC", network = mockk()) + val model = createModel(testScope = this) + advanceUntilIdle() + val validatedAddress = ValidatedAddress(address = "0xABC", networkIds = persistentListOf("ethereum")) // Act - model.state.value.onAddAddressClick() - capturedSink?.invoke(validatedAddress) + resultHolder.setConfirmedAddress(validatedAddress) + advanceUntilIdle() + + // Assert + assertThat(model.state.value.addresses).containsExactly(validatedAddress) + // The value must be consumed so it is not re-applied on resubscription. + assertThat(resultHolder.confirmedAddress.value).isNull() + } + + @Test + fun `GIVEN same address confirmed twice WHEN collected THEN added only once`() = runTest { + // Arrange + val model = createModel(testScope = this) + advanceUntilIdle() + val validatedAddress = ValidatedAddress(address = "0xABC", networkIds = persistentListOf("ethereum")) + + // Act + resultHolder.setConfirmedAddress(validatedAddress) + advanceUntilIdle() + resultHolder.setConfirmedAddress(validatedAddress) + advanceUntilIdle() // Assert assertThat(model.state.value.addresses).containsExactly(validatedAddress) } + @Test + fun `GIVEN predefined address WHEN model created THEN address attached`() = runTest { + // Arrange + val predefined = ValidatedAddress(address = "0xABC", networkIds = persistentListOf("ethereum")) + + // Act + val model = createModel(testScope = this, params = createParams(predefinedAddress = predefined)) + advanceUntilIdle() + + // Assert + assertThat(model.state.value.addresses).containsExactly(predefined) + } + + private fun createParams( + contactId: ContactId? = null, + predefinedAddress: ValidatedAddress? = null, + ): DefaultEditContactComponent.Params = DefaultEditContactComponent.Params( + contactId = contactId, + predefinedAddress = predefinedAddress, + onBackClick = {}, + onAddAddressClick = {}, + ) + private fun createModel( testScope: TestScope, - params: EditContactComponent.Params = EditContactComponent.Params( - contactId = null, - onBackClick = {}, - onAddAddressClick = {}, - ), + params: DefaultEditContactComponent.Params = createParams(), paramsContainer: ParamsContainer = MutableParamsContainer(value = params), ): EditContactModel { return EditContactModel( paramsContainer = paramsContainer, dispatchers = testScope.createTestingCoroutineDispatcherProvider(), - ) + stateController = EditContactStateController(), + resultHolder = resultHolder, + ).also { model = it } } private fun TestScope.createTestingCoroutineDispatcherProvider(): TestingCoroutineDispatcherProvider { diff --git a/features/approval/impl/src/main/java/com/tangem/features/approval/impl/DefaultGiveApprovalComponent.kt b/features/approval/impl/src/main/java/com/tangem/features/approval/impl/DefaultGiveApprovalComponent.kt index 03e2bf29c2..9e42edab58 100644 --- a/features/approval/impl/src/main/java/com/tangem/features/approval/impl/DefaultGiveApprovalComponent.kt +++ b/features/approval/impl/src/main/java/com/tangem/features/approval/impl/DefaultGiveApprovalComponent.kt @@ -17,10 +17,10 @@ import com.tangem.core.ui.res.TangemTheme import com.tangem.features.approval.api.GiveApprovalComponent import com.tangem.features.approval.impl.model.GiveApprovalModel import com.tangem.features.approval.impl.ui.GiveApprovalContent -import com.tangem.features.send.api.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents -import com.tangem.features.send.api.entity.FeeSelectorUM -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject diff --git a/features/approval/impl/src/main/java/com/tangem/features/approval/impl/model/GiveApprovalModel.kt b/features/approval/impl/src/main/java/com/tangem/features/approval/impl/model/GiveApprovalModel.kt index ceabc3db34..e5a8cf2341 100644 --- a/features/approval/impl/src/main/java/com/tangem/features/approval/impl/model/GiveApprovalModel.kt +++ b/features/approval/impl/src/main/java/com/tangem/features/approval/impl/model/GiveApprovalModel.kt @@ -33,9 +33,9 @@ import com.tangem.domain.transaction.usecase.gasless.GetFeeForGaslessUseCase import com.tangem.domain.transaction.usecase.gasless.GetFeeForTokenUseCase import com.tangem.domain.wallets.usecase.GetUserWalletUseCase import com.tangem.features.approval.api.GiveApprovalComponent -import com.tangem.features.send.api.callbacks.FeeSelectorModelCallback -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.callbacks.FeeSelectorModelCallback +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorReloadTrigger import com.tangem.utils.coroutines.CoroutineDispatcherProvider import com.tangem.utils.logging.TangemLogger diff --git a/features/approval/impl/src/main/java/com/tangem/features/approval/impl/ui/GiveApprovalContent.kt b/features/approval/impl/src/main/java/com/tangem/features/approval/impl/ui/GiveApprovalContent.kt index 5d6e9c3384..f10531e8f7 100644 --- a/features/approval/impl/src/main/java/com/tangem/features/approval/impl/ui/GiveApprovalContent.kt +++ b/features/approval/impl/src/main/java/com/tangem/features/approval/impl/ui/GiveApprovalContent.kt @@ -34,7 +34,7 @@ import com.tangem.core.ui.extensions.* import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreview import com.tangem.features.approval.impl.model.GiveApprovalUM -import com.tangem.features.send.api.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf diff --git a/features/approval/impl/src/main/java/com/tangem/features/approval/impl/ui/PreviewFeeSelectorBlockComponent.kt b/features/approval/impl/src/main/java/com/tangem/features/approval/impl/ui/PreviewFeeSelectorBlockComponent.kt index 7d4fd8af04..3aabef7629 100644 --- a/features/approval/impl/src/main/java/com/tangem/features/approval/impl/ui/PreviewFeeSelectorBlockComponent.kt +++ b/features/approval/impl/src/main/java/com/tangem/features/approval/impl/ui/PreviewFeeSelectorBlockComponent.kt @@ -2,8 +2,8 @@ package com.tangem.features.approval.impl.ui import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import com.tangem.features.send.api.FeeSelectorBlockComponent -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM internal class PreviewFeeSelectorBlockComponent : FeeSelectorBlockComponent { override fun updateState(feeSelectorUM: FeeSelectorUM) { diff --git a/features/details/impl/src/main/kotlin/com/tangem/features/details/entity/DetailsItemUM.kt b/features/details/impl/src/main/kotlin/com/tangem/features/details/entity/DetailsItemUM.kt index e7849eebed..7082a0c24e 100644 --- a/features/details/impl/src/main/kotlin/com/tangem/features/details/entity/DetailsItemUM.kt +++ b/features/details/impl/src/main/kotlin/com/tangem/features/details/entity/DetailsItemUM.kt @@ -25,10 +25,11 @@ internal sealed class DetailsItemUM { override val id: String = "wallet_connect" } - data class WalletConnectAddressBookBlock(val items: List) : DetailsItemUM() { + data class WalletActionBlock(val items: ImmutableList) : DetailsItemUM() { override val id: String = "wallet_connect_address_book" sealed class Item(open val onClick: () -> Unit) { + data class WalletConnect(override val onClick: () -> Unit) : Item(onClick) data class AddressBook(override val onClick: () -> Unit) : Item(onClick) } diff --git a/features/details/impl/src/main/kotlin/com/tangem/features/details/ui/DetailsScreen.kt b/features/details/impl/src/main/kotlin/com/tangem/features/details/ui/DetailsScreen.kt index 427c80adce..48d51c0835 100644 --- a/features/details/impl/src/main/kotlin/com/tangem/features/details/ui/DetailsScreen.kt +++ b/features/details/impl/src/main/kotlin/com/tangem/features/details/ui/DetailsScreen.kt @@ -2,13 +2,13 @@ package com.tangem.features.details.ui import android.content.res.Configuration import androidx.compose.foundation.background -import androidx.compose.foundation.clickable import androidx.compose.foundation.gestures.Orientation import androidx.compose.foundation.gestures.scrollable import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.Scaffold @@ -17,6 +17,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.key import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview @@ -27,19 +28,27 @@ import com.tangem.core.ui.components.appbar.TangemTopAppBar import com.tangem.core.ui.components.appbar.models.TopAppBarButtonUM import com.tangem.core.ui.components.block.BlockCard import com.tangem.core.ui.components.block.BlockItem -import com.tangem.core.ui.components.inputrow.InputRowImageBase import com.tangem.core.ui.decompose.ComposableContentComponent +import com.tangem.core.ui.ds.image.TangemIcon +import com.tangem.core.ui.ds.image.TangemIconUM +import com.tangem.core.ui.ds2.row.TangemRow +import com.tangem.core.ui.ds2.row.TangemRowText +import com.tangem.core.ui.ds2.row.TangemRowTextRole +import com.tangem.core.ui.ds2.row.TangemRowVerticalAlignment import com.tangem.core.ui.extensions.TextReference import com.tangem.core.ui.extensions.resolveReference import com.tangem.core.ui.extensions.stringResourceSafe import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreview +import com.tangem.core.ui.res.generated.icons.Icons +import com.tangem.core.ui.res.generated.icons.ic_chevron_right_20 import com.tangem.core.ui.test.DetailsScreenTestTags import com.tangem.features.details.component.preview.PreviewDetailsComponent import com.tangem.features.details.entity.DetailsFooterUM import com.tangem.features.details.entity.DetailsItemUM import com.tangem.features.details.entity.DetailsUM import com.tangem.features.details.impl.R +import kotlinx.collections.immutable.ImmutableList @Composable internal fun DetailsScreen( @@ -159,9 +168,9 @@ private fun Block( onClick = model.onClick, ) } - is DetailsItemUM.WalletConnectAddressBookBlock -> { + is DetailsItemUM.WalletActionBlock -> { BlockCard { - WalletConnectAddressBookBlockItems( + WalletActionsBlock( items = model.items, modifier = itemModifier, ) @@ -170,37 +179,106 @@ private fun Block( is DetailsItemUM.UserWalletList -> { userWalletListBlockContent.Content(modifier = itemModifier) } - is DetailsItemUM.UnderSectionText -> { /* Handled above */ - } + is DetailsItemUM.UnderSectionText -> Unit } } } @Composable -private fun WalletConnectAddressBookBlockItems( - items: List, +private fun WalletActionsBlock( + items: ImmutableList, modifier: Modifier = Modifier, ) { items.fastForEach { item -> when (item) { - is DetailsItemUM.WalletConnectAddressBookBlock.Item.WalletConnect -> InputRowImageBase( - modifier = modifier.clickable(onClick = item.onClick).padding(12.dp), - iconResVector = R.drawable.ic_wallet_connect_24, - iconTint = TangemTheme.colors.icon.primary1, - subtitle = TextReference.Res(R.string.wallet_connect_title), - caption = TextReference.Res(R.string.wallet_connect_subtitle), + is DetailsItemUM.WalletActionBlock.Item.WalletConnect -> WalletConnectActionRow( + onClick = item.onClick, + modifier = modifier, ) - is DetailsItemUM.WalletConnectAddressBookBlock.Item.AddressBook -> InputRowImageBase( - modifier = modifier.clickable(onClick = item.onClick).padding(12.dp), - iconResVector = R.drawable.ic_contact_20, - iconTint = TangemTheme.colors.icon.accent, - subtitle = TextReference.Res(R.string.address_book_title), - caption = TextReference.Res(R.string.address_book_description), + is DetailsItemUM.WalletActionBlock.Item.AddressBook -> AddressBookActionRow( + onClick = item.onClick, + modifier = modifier, ) } } } +@Composable +private fun WalletConnectActionRow(onClick: () -> Unit, modifier: Modifier = Modifier) { + TangemRow( + verticalAlignment = TangemRowVerticalAlignment.Center, + modifier = modifier, + onClick = onClick, + startSlot = { + TangemIcon( + tangemIconUM = TangemIconUM.Image(R.drawable.img_wallet_connect_76), + modifier = Modifier + .size(40.dp) + .clip(RoundedCornerShape(12.dp)), + ) + }, + titleSlot = { + TangemRowText( + text = TextReference.Res(R.string.wallet_connect_title), + role = TangemRowTextRole.Title, + ) + }, + subtitleSlot = { + TangemRowText( + text = TextReference.Res(R.string.wallet_connect_subtitle), + role = TangemRowTextRole.Subtitle, + ) + }, + endSlot = { ActionRowChevron() }, + ) +} + +@Composable +private fun AddressBookActionRow(onClick: () -> Unit, modifier: Modifier = Modifier) { + TangemRow( + verticalAlignment = TangemRowVerticalAlignment.Center, + modifier = modifier, + onClick = onClick, + startSlot = { + TangemIcon( + tangemIconUM = TangemIconUM.Icon( + iconRes = R.drawable.ic_address_book_24, + tintReference = { TangemTheme.colors3.icon.brand }, + ), + modifier = Modifier + .size(40.dp) + .background( + color = TangemTheme.colors3.bg.status.infoSubtle, + shape = RoundedCornerShape(12.dp), + ) + .padding(8.dp), + ) + }, + titleSlot = { + TangemRowText( + text = TextReference.Res(R.string.address_book_title), + role = TangemRowTextRole.Title, + ) + }, + subtitleSlot = { + TangemRowText( + text = TextReference.Res(R.string.address_book_description), + role = TangemRowTextRole.Subtitle, + ) + }, + endSlot = { ActionRowChevron() }, + ) +} + +@Composable +private fun ActionRowChevron() { + Icon( + imageVector = Icons.ic_chevron_right_20, + contentDescription = null, + tint = TangemTheme.colors3.icon.secondary, + ) +} + @Composable private fun UnderSectionTextBlock(text: TextReference, modifier: Modifier = Modifier) { Text( diff --git a/features/details/impl/src/main/kotlin/com/tangem/features/details/utils/ItemsBuilder.kt b/features/details/impl/src/main/kotlin/com/tangem/features/details/utils/ItemsBuilder.kt index df2e653821..99d34d298d 100644 --- a/features/details/impl/src/main/kotlin/com/tangem/features/details/utils/ItemsBuilder.kt +++ b/features/details/impl/src/main/kotlin/com/tangem/features/details/utils/ItemsBuilder.kt @@ -35,7 +35,7 @@ internal class ItemsBuilder @Inject constructor( onBuyClick: () -> Unit, ): ImmutableList = buildList { if (isAddressBookAvailable) { - buildWalletConnectAddressBookBlock(isWalletConnectAvailable, userWalletId) + buildWalletActionBlock(isWalletConnectAvailable, userWalletId) } else { buildWalletConnectBlock(isWalletConnectAvailable, userWalletId)?.let(::add) } @@ -91,29 +91,29 @@ internal class ItemsBuilder @Inject constructor( } } - private fun MutableList.buildWalletConnectAddressBookBlock( + private fun MutableList.buildWalletActionBlock( isWalletConnectAvailable: Boolean, userWalletId: UserWalletId, ) { - val walletConnectAddressBookItems = buildList { + val walletActionItems = buildList { if (isWalletConnectAvailable) add(buildWalletConnectButton(userWalletId)) add(buildAddressBookButton()) - } - if (walletConnectAddressBookItems.isNotEmpty()) { - add(DetailsItemUM.WalletConnectAddressBookBlock(walletConnectAddressBookItems)) + }.toImmutableList() + if (walletActionItems.isNotEmpty()) { + add(DetailsItemUM.WalletActionBlock(walletActionItems)) } } private fun buildWalletConnectButton( userWalletId: UserWalletId, - ): DetailsItemUM.WalletConnectAddressBookBlock.Item.WalletConnect { - return DetailsItemUM.WalletConnectAddressBookBlock.Item.WalletConnect( + ): DetailsItemUM.WalletActionBlock.Item.WalletConnect { + return DetailsItemUM.WalletActionBlock.Item.WalletConnect( onClick = { router.push(AppRoute.WalletConnectSessions(userWalletId)) }, ) } - private fun buildAddressBookButton(): DetailsItemUM.WalletConnectAddressBookBlock.Item.AddressBook { - return DetailsItemUM.WalletConnectAddressBookBlock.Item.AddressBook( + private fun buildAddressBookButton(): DetailsItemUM.WalletActionBlock.Item.AddressBook { + return DetailsItemUM.WalletActionBlock.Item.AddressBook( onClick = { router.push(AppRoute.AddressBook()) }, ) } diff --git a/features/details/impl/src/test/kotlin/com/tangem/features/details/utils/ItemsBuilderTest.kt b/features/details/impl/src/test/kotlin/com/tangem/features/details/utils/ItemsBuilderTest.kt index d6962201eb..6f4c22d644 100644 --- a/features/details/impl/src/test/kotlin/com/tangem/features/details/utils/ItemsBuilderTest.kt +++ b/features/details/impl/src/test/kotlin/com/tangem/features/details/utils/ItemsBuilderTest.kt @@ -65,10 +65,10 @@ internal class ItemsBuilderTest { "support", ).inOrder() - val block = result.first() as DetailsItemUM.WalletConnectAddressBookBlock + val block = result.first() as DetailsItemUM.WalletActionBlock assertThat(block.items.map { it::class.java }).containsExactly( - DetailsItemUM.WalletConnectAddressBookBlock.Item.WalletConnect::class.java, - DetailsItemUM.WalletConnectAddressBookBlock.Item.AddressBook::class.java, + DetailsItemUM.WalletActionBlock.Item.WalletConnect::class.java, + DetailsItemUM.WalletActionBlock.Item.AddressBook::class.java, ).inOrder() } @@ -86,9 +86,9 @@ internal class ItemsBuilderTest { "support", ).inOrder() - val block = result.first() as DetailsItemUM.WalletConnectAddressBookBlock + val block = result.first() as DetailsItemUM.WalletActionBlock assertThat(block.items.map { it::class.java }).containsExactly( - DetailsItemUM.WalletConnectAddressBookBlock.Item.AddressBook::class.java, + DetailsItemUM.WalletActionBlock.Item.AddressBook::class.java, ) } @@ -109,9 +109,9 @@ internal class ItemsBuilderTest { fun `GIVEN combined block walletConnect item WHEN clicked THEN router pushes WalletConnectSessions`() { // Arrange val result = buildAll(isWalletConnectAvailable = true, isAddressBookAvailable = true) - val block = result.first() as DetailsItemUM.WalletConnectAddressBookBlock + val block = result.first() as DetailsItemUM.WalletActionBlock val walletConnect = block.items - .filterIsInstance() + .filterIsInstance() .single() // Act @@ -125,9 +125,9 @@ internal class ItemsBuilderTest { fun `GIVEN combined block addressBook item WHEN clicked THEN router pushes AddressBook`() { // Arrange val result = buildAll(isWalletConnectAvailable = true, isAddressBookAvailable = true) - val block = result.first() as DetailsItemUM.WalletConnectAddressBookBlock + val block = result.first() as DetailsItemUM.WalletActionBlock val addressBook = block.items - .filterIsInstance() + .filterIsInstance() .single() // Act diff --git a/features/home/api/src/main/kotlin/com/tangem/features/home/api/HomeFeatureToggles.kt b/features/home/api/src/main/kotlin/com/tangem/features/home/api/HomeFeatureToggles.kt new file mode 100644 index 0000000000..c991bd16d5 --- /dev/null +++ b/features/home/api/src/main/kotlin/com/tangem/features/home/api/HomeFeatureToggles.kt @@ -0,0 +1,6 @@ +package com.tangem.features.home.api + +interface HomeFeatureToggles { + + val isStoriesContainerEnabled: Boolean +} \ No newline at end of file diff --git a/features/home/impl/build.gradle.kts b/features/home/impl/build.gradle.kts index afa7941725..ff389bc6fd 100644 --- a/features/home/impl/build.gradle.kts +++ b/features/home/impl/build.gradle.kts @@ -13,59 +13,45 @@ android { dependencies { /** Api */ implementation(projects.features.home.api) - implementation(projects.features.hotWallet.api) /** Core modules */ implementation(projects.core.decompose) implementation(projects.core.ui) - implementation(projects.core.res) implementation(projects.core.analytics) implementation(projects.core.analytics.models) - implementation(projects.core.navigation) implementation(projects.core.utils) + implementation(projects.core.configToggles) /** Common */ implementation(projects.common.routing) - + /** Domain */ implementation(projects.domain.common) implementation(projects.domain.models) - implementation(projects.domain.core) implementation(projects.domain.card) implementation(projects.domain.settings) - implementation(projects.domain.tokens) implementation(projects.domain.wallets) - implementation(projects.domain.wallets.models) - implementation(projects.domain.legacy) - implementation(projects.domain.feedback) - implementation(projects.domain.feedback.models) - implementation(projects.domain.referral) /** Referral */ implementation(projects.features.referral.domain) - /** AndroidX libraries */ - implementation(deps.androidx.activity.compose) - implementation(deps.lifecycle.runtime.ktx) - /** Compose libraries */ implementation(deps.compose.ui) implementation(deps.compose.ui.tooling) implementation(deps.compose.foundation) implementation(deps.compose.material3) implementation(deps.compose.animation) - implementation(deps.compose.coil) - implementation(deps.decompose.ext.compose) - + /** Tangem libraries */ - implementation(tangemDeps.card.android) implementation(tangemDeps.card.core) - implementation(tangemDeps.blockchain) - + /** Other libraries */ implementation(deps.kotlin.immutable.collections) - + /** DI */ implementation(deps.hilt.android) kapt(deps.hilt.kapt) -} \ No newline at end of file + + /** Tests */ + testImplementation(projects.test.core) +} \ No newline at end of file diff --git a/features/home/impl/detekt-baseline-debug.xml b/features/home/impl/detekt-baseline-debug.xml deleted file mode 100644 index 7509758457..0000000000 --- a/features/home/impl/detekt-baseline-debug.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - BooleanPropertyNaming:HomeButtons.kt$HomeButtonsState$val btnScanStateInProgress: Boolean - BooleanPropertyNaming:HomeUM.kt$HomeUM$val scanInProgress: Boolean - MultilineLambdaItParameter:StoriesProgressBar.kt${ when (index) { currentStep -> it.fillMaxWidth(progress.value) in 0 until currentStep -> it.fillMaxWidth(fraction = 1f) else -> it } } - ReusedModifierInstance:HomeButtonsV2.kt$StoriesButton( modifier = modifier, text = stringResourceSafe(id = R.string.common_get_started), useDarkerColors = false, onClick = onGetStartedClick, ) - - diff --git a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/DefaultHomeFeatureToggles.kt b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/DefaultHomeFeatureToggles.kt new file mode 100644 index 0000000000..81085edfe0 --- /dev/null +++ b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/DefaultHomeFeatureToggles.kt @@ -0,0 +1,13 @@ +package com.tangem.features.home.impl + +import com.tangem.core.configtoggle.FeatureToggles +import com.tangem.core.configtoggle.feature.FeatureTogglesManager +import com.tangem.features.home.api.HomeFeatureToggles + +internal class DefaultHomeFeatureToggles( + private val featureTogglesManager: FeatureTogglesManager, +) : HomeFeatureToggles { + + override val isStoriesContainerEnabled: Boolean + get() = featureTogglesManager.isFeatureEnabled(FeatureToggles.AND_15901_STORIES_CONTAINER_ENABLED) +} \ No newline at end of file diff --git a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/di/HomeFeatureModule.kt b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/di/HomeFeatureModule.kt index cb6516bc9b..5b764ba1c6 100644 --- a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/di/HomeFeatureModule.kt +++ b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/di/HomeFeatureModule.kt @@ -1,12 +1,16 @@ package com.tangem.features.home.impl.di +import com.tangem.core.configtoggle.feature.FeatureTogglesManager import com.tangem.core.decompose.di.ModelComponent import com.tangem.core.decompose.model.Model import com.tangem.features.home.api.HomeComponent +import com.tangem.features.home.api.HomeFeatureToggles import com.tangem.features.home.impl.DefaultHomeComponent +import com.tangem.features.home.impl.DefaultHomeFeatureToggles import com.tangem.features.home.impl.model.HomeModel import dagger.Binds import dagger.Module +import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent import dagger.multibindings.ClassKey @@ -22,6 +26,17 @@ internal interface ComponentModule { fun bindComponent(factory: DefaultHomeComponent.Factory): HomeComponent.Factory } +@Module +@InstallIn(SingletonComponent::class) +internal object HomeFeatureTogglesModule { + + @Provides + @Singleton + fun provideHomeFeatureToggles(featureTogglesManager: FeatureTogglesManager): HomeFeatureToggles { + return DefaultHomeFeatureToggles(featureTogglesManager) + } +} + @Module @InstallIn(ModelComponent::class) internal interface ModelModule { diff --git a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/model/HomeModel.kt b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/model/HomeModel.kt index 147e146fa6..faf9bfc2be 100644 --- a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/model/HomeModel.kt +++ b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/model/HomeModel.kt @@ -3,8 +3,6 @@ package com.tangem.features.home.impl.model import com.tangem.common.core.TangemError import com.tangem.common.core.TangemSdkError import com.tangem.common.routing.AppRoute -import com.tangem.common.routing.AppRoute.ManageTokens.Source -import com.tangem.common.routing.AppRouter import com.tangem.common.routing.entity.InitScreenLaunchMode import com.tangem.core.analytics.api.AnalyticsEventHandler import com.tangem.core.analytics.models.AnalyticsParam @@ -16,11 +14,9 @@ import com.tangem.core.decompose.model.Model import com.tangem.core.decompose.model.ParamsContainer import com.tangem.core.decompose.navigation.Router import com.tangem.core.decompose.ui.UiMessageSender -import com.tangem.core.navigation.url.UrlOpener import com.tangem.core.ui.message.dialog.Dialogs import com.tangem.domain.card.ScanCardProcessor import com.tangem.domain.card.analytics.IntroductionProcess -import com.tangem.domain.card.analytics.Shop import com.tangem.domain.card.repository.CardSdkConfigRepository import com.tangem.domain.common.wallets.UserWalletsListRepository import com.tangem.domain.common.wallets.error.SaveWalletError @@ -30,10 +26,11 @@ import com.tangem.domain.settings.usercountry.GetUserCountryUseCase import com.tangem.domain.settings.usercountry.models.UserCountry import com.tangem.domain.settings.usercountry.models.needApplyFCARestrictions import com.tangem.domain.wallets.builder.ColdUserWalletBuilder -import com.tangem.domain.wallets.usecase.GenerateBuyTangemCardLinkUseCase import com.tangem.domain.wallets.usecase.SaveWalletUseCase import com.tangem.feature.referral.domain.ShouldShowMobileWalletPromoUseCase import com.tangem.features.home.api.HomeComponent +import com.tangem.features.home.api.HomeFeatureToggles +import com.tangem.features.home.impl.ui.state.HomeStoriesConfig import com.tangem.features.home.impl.ui.state.HomeUM import com.tangem.features.home.impl.ui.state.Stories import com.tangem.features.home.impl.ui.state.getRestrictedStories @@ -59,14 +56,12 @@ internal class HomeModel @Inject constructor( private val settingsRepository: SettingsRepository, private val analyticsEventHandler: AnalyticsEventHandler, private val router: Router, - private val appRouter: AppRouter, private val getUserCountryUseCase: GetUserCountryUseCase, private val coldUserWalletBuilderFactory: ColdUserWalletBuilder.Factory, private val saveWalletUseCase: SaveWalletUseCase, - private val generateBuyTangemCardLinkUseCase: GenerateBuyTangemCardLinkUseCase, - private val urlOpener: UrlOpener, private val userWalletsListRepository: UserWalletsListRepository, private val shouldShowMobileWalletPromoUseCase: ShouldShowMobileWalletPromoUseCase, + private val homeFeatureToggles: HomeFeatureToggles, @GlobalUiMessageSender private val uiMessageSender: UiMessageSender, ) : Model() { @@ -74,17 +69,8 @@ internal class HomeModel @Inject constructor( val params = paramsContainer.require() - private val _uiState = MutableStateFlow( - HomeUM( - scanInProgress = false, - stories = getRestrictedStories().toImmutableList(), - onShopClick = ::onShopClick, - onSearchTokensClick = ::onSearchTokensClick, - onGetStartedClick = ::onGetStartedClick, - ), - ) - - val uiState = _uiState.asStateFlow() + val uiState: StateFlow + field = MutableStateFlow(createInitialState()) init { analyticsEventHandler.send(IntroductionProcess.ScreenOpened()) @@ -96,6 +82,17 @@ internal class HomeModel @Inject constructor( } } + private fun createInitialState(): HomeUM { + val initialStories = getRestrictedStories().toImmutableList() + return HomeUM( + isScanInProgress = false, + isStoriesContainerEnabled = homeFeatureToggles.isStoriesContainerEnabled, + stories = initialStories, + storiesConfig = HomeStoriesConfig(stories = initialStories), + onGetStartedClick = ::onGetStartedClick, + ) + } + private fun observeUserCountryChanges() { getUserCountryUseCase.invoke() .distinctUntilChanged() @@ -114,35 +111,21 @@ internal class HomeModel @Inject constructor( } else { Stories.entries } + .toImmutableList() - _uiState.update { - it.copy(stories = stories.toImmutableList()) + uiState.update { + it.copy(stories = stories, storiesConfig = HomeStoriesConfig(stories = stories)) } } - private fun onShopClick() { - analyticsEventHandler.send(IntroductionProcess.ButtonBuyCards()) - analyticsEventHandler.send(Shop.ScreenOpened()) - modelScope.launch { - generateBuyTangemCardLinkUseCase.invoke(null).let { urlOpener.openUrl(it) } - } - } - - private fun onSearchTokensClick() { - analyticsEventHandler.send(IntroductionProcess.ButtonTokensList()) - router.push(AppRoute.ManageTokens(Source.STORIES)) - } - private fun onGetStartedClick() { debouncer.debounce(modelScope) { - modelScope.launch { - val mode = if (shouldShowMobileWalletPromoUseCase()) { - AppRoute.CreateWalletStart.Mode.HotWallet - } else { - AppRoute.CreateWalletStart.Mode.ColdWallet - } - router.push(AppRoute.CreateWalletStart(mode = mode)) + val mode = if (shouldShowMobileWalletPromoUseCase()) { + AppRoute.CreateWalletStart.Mode.HotWallet + } else { + AppRoute.CreateWalletStart.Mode.ColdWallet } + router.push(AppRoute.CreateWalletStart(mode = mode)) } } @@ -198,13 +181,13 @@ internal class HomeModel @Inject constructor( setLoading(false) when (error) { is SaveWalletError.DataError -> TangemLogger.e("Unable to save user wallet: $error") - is SaveWalletError.WalletAlreadySaved -> appRouter.replaceAll(AppRoute.Wallet) + is SaveWalletError.WalletAlreadySaved -> router.replaceAll(AppRoute.Wallet) } }, ifRight = { setLoading(false) sendSignedInCardAnalyticsEvent(scanResponse, userWallet.isImported) - appRouter.replaceAll(AppRoute.Wallet) + router.replaceAll(AppRoute.Wallet) }, ) } @@ -221,7 +204,7 @@ internal class HomeModel @Inject constructor( } private fun setLoading(isLoading: Boolean) { - _uiState.update { it.copy(scanInProgress = isLoading) } + uiState.update { it.copy(isScanInProgress = isLoading) } } private fun handleScanError(error: TangemError) { diff --git a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/Home.kt b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/Home.kt index b245ef97b4..09492c1c74 100644 --- a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/Home.kt +++ b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/Home.kt @@ -5,6 +5,7 @@ import androidx.compose.ui.Modifier import com.tangem.core.ui.components.SystemBarsIconsDisposable import com.tangem.core.ui.res.TangemColorPalette import com.tangem.core.ui.utils.ChangeRootBackgroundColorEffect +import com.tangem.features.home.impl.ui.compose.HomeStoriesScreen import com.tangem.features.home.impl.ui.compose.StoriesScreenV2 import com.tangem.features.home.impl.ui.state.HomeUM @@ -12,11 +13,18 @@ import com.tangem.features.home.impl.ui.state.HomeUM internal fun Home(state: HomeUM, modifier: Modifier = Modifier) { SystemBarsIconsDisposable(darkIcons = false) - StoriesScreenV2( - modifier = modifier, - state = state, - onGetStartedClick = state.onGetStartedClick, - ) + if (state.isStoriesContainerEnabled) { + HomeStoriesScreen( + modifier = modifier, + state = state, + ) + } else { + StoriesScreenV2( + modifier = modifier, + state = state, + onGetStartedClick = state.onGetStartedClick, + ) + } ChangeRootBackgroundColorEffect(TangemColorPalette.Black) } \ No newline at end of file diff --git a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/HomeStoriesScreen.kt b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/HomeStoriesScreen.kt new file mode 100644 index 0000000000..d0345df0ae --- /dev/null +++ b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/HomeStoriesScreen.kt @@ -0,0 +1,102 @@ +package com.tangem.features.home.impl.ui.compose + +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.navigationBarsPadding +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.statusBarsPadding +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.painterResource +import com.tangem.core.ui.R +import com.tangem.core.ui.components.stories.StoriesContainer +import com.tangem.core.ui.res.TangemTheme +import com.tangem.core.ui.test.StoriesScreenTestTags +import com.tangem.features.home.impl.ui.compose.content.FirstStoriesContent +import com.tangem.features.home.impl.ui.compose.content.StoriesCurrencies +import com.tangem.features.home.impl.ui.compose.content.StoriesRevolutionaryWallet +import com.tangem.features.home.impl.ui.compose.content.StoriesUltraSecureBackup +import com.tangem.features.home.impl.ui.compose.content.StoriesWalletForEveryone +import com.tangem.features.home.impl.ui.compose.content.StoriesWeb3 +import com.tangem.features.home.impl.ui.compose.views.HomeButtonsV2 +import com.tangem.features.home.impl.ui.state.HomeUM +import com.tangem.features.home.impl.ui.state.Stories + +private const val BACKGROUND_COLOR = 0xFF010101L + +/** + * Home stories built on the shared [StoriesContainer]. + * The container provides the progress bar, tap/hold navigation and pause; this screen supplies the + * per-story content, the Tangem logo and the persistent "Get Started" button. + */ +@Composable +internal fun HomeStoriesScreen(state: HomeUM, modifier: Modifier = Modifier) { + Box( + modifier = modifier + .fillMaxSize() + .background(Color(BACKGROUND_COLOR)) + .testTag(StoriesScreenTestTags.SCREEN_CONTAINER), + ) { + StoriesContainer( + modifier = Modifier.fillMaxSize(), + config = state.storiesConfig, + isPauseStories = state.isScanInProgress, + ) { story, isPaused -> + Column( + modifier = Modifier + .statusBarsPadding() + .fillMaxSize(), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center, + ) { + Image( + painter = painterResource(id = R.drawable.ic_tangem_logo), + contentDescription = null, + contentScale = ContentScale.FillHeight, + modifier = Modifier + .padding( + start = TangemTheme.dimens.spacing16, + top = TangemTheme.dimens.spacing16, + ) + .height(TangemTheme.dimens.size18) + .align(Alignment.Start), + ) + when (story) { + Stories.TangemIntro -> FirstStoriesContent(isPaused = isPaused, duration = story.duration) + Stories.RevolutionaryWallet -> StoriesRevolutionaryWallet() + Stories.UltraSecureBackup -> StoriesUltraSecureBackup( + isPaused = isPaused, + stepDuration = story.duration, + ) + Stories.Currencies -> StoriesCurrencies(isPaused, story.duration) + Stories.Web3 -> StoriesWeb3(isPaused, story.duration) + Stories.WalletForEveryone -> StoriesWalletForEveryone(story.duration) + } + } + } + Column( + modifier = Modifier + .navigationBarsPadding() + .padding(bottom = TangemTheme.dimens.spacing16) + .padding(horizontal = TangemTheme.dimens.spacing16) + .align(Alignment.BottomCenter) + .fillMaxWidth(), + verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing12), + ) { + HomeButtonsV2( + modifier = Modifier.fillMaxWidth(), + onGetStartedClick = state.onGetStartedClick, + ) + } + } +} \ No newline at end of file diff --git a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/StoriesAnimation.kt b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/StoriesAnimation.kt index 1056d363be..a1fcf66dac 100644 --- a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/StoriesAnimation.kt +++ b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/StoriesAnimation.kt @@ -26,7 +26,7 @@ private const val SCALE_SWITCH_BARRIER = 1.15f @Suppress("LongParameterList") @Composable -fun HorizontalSlidingImage( +internal fun HorizontalSlidingImage( painter: Painter, paused: Boolean, duration: Int, @@ -52,7 +52,7 @@ fun HorizontalSlidingImage( } @Composable -fun StoriesTextAnimation( +internal fun StoriesTextAnimation( slideInDuration: Int = 500, slideInDelay: Int = 200, slideDistance: Dp = 60.dp, @@ -94,7 +94,7 @@ fun StoriesTextAnimation( } @Composable -fun StoriesBottomImageAnimation( +internal fun StoriesBottomImageAnimation( firstStepDuration: Int, totalDuration: Int, initialScale: Float = 2.5f, diff --git a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/StoriesScreenV2.kt b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/StoriesScreenV2.kt index e3a485d2cd..a9c380a56a 100644 --- a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/StoriesScreenV2.kt +++ b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/StoriesScreenV2.kt @@ -27,7 +27,9 @@ import com.tangem.features.home.impl.ui.state.Stories import kotlin.math.max import com.tangem.core.ui.R import com.tangem.features.home.impl.ui.state.HomeUM +import com.tangem.utils.annotations.RemoveWithToggle +@RemoveWithToggle("AND_15901_STORIES_CONTAINER_ENABLED") @Composable internal fun StoriesScreenV2(state: HomeUM, onGetStartedClick: () -> Unit, modifier: Modifier = Modifier) { var currentStory by remember { mutableStateOf(state.firstStory) } @@ -61,7 +63,7 @@ internal fun StoriesScreenV2(state: HomeUM, onGetStartedClick: () -> Unit, modif storiesSize = state.stories.lastIndex, currentStoryIndex = currentStoryIndex, currentStory = currentStory, - isScanInProgress = state.scanInProgress, + isScanInProgress = state.isScanInProgress, onGoToPreviousStory = goToPreviousStory, onGoToNextStory = goToNextStory, onGetStartedClick = onGetStartedClick, diff --git a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/content/CurrenciesWeb3Content.kt b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/content/CurrenciesWeb3Content.kt index 66f639bc51..149c446f45 100644 --- a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/content/CurrenciesWeb3Content.kt +++ b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/content/CurrenciesWeb3Content.kt @@ -3,7 +3,6 @@ package com.tangem.features.home.impl.ui.compose.content import androidx.compose.foundation.background import androidx.compose.foundation.layout.* import androidx.compose.runtime.Composable -import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Brush @@ -22,33 +21,44 @@ import com.tangem.core.ui.R import com.tangem.core.ui.utils.dpSize import com.tangem.core.ui.utils.toPx -@Composable -fun StoriesCurrenciesContent(paused: Boolean, duration: Int) { - val currencyDrawableList = remember { - listOf( - R.drawable.currency0, - R.drawable.currency1, - R.drawable.currency2, - R.drawable.currency3, - R.drawable.currency4, - ) - } +private val currencyDrawables = listOf( + R.drawable.currency0, + R.drawable.currency1, + R.drawable.currency2, + R.drawable.currency3, + R.drawable.currency4, +) +private val web3DappDrawables = listOf( + R.drawable.dapps1, + R.drawable.dapps1, + R.drawable.dapps2, + R.drawable.dapps3, + R.drawable.dapps4, + R.drawable.dapps5, +) + +private val currencyDesignItemHeight = 82.dp +private val web3DesignItemHeight = 75.dp +private val currencyDecreaseRate = 1f / currencyDrawables.size +private val web3DecreaseRate = 1f / web3DappDrawables.size +private const val WEB3_CHESS_OFFSET_DIVIDER = 3 + +@Composable +internal fun StoriesCurrenciesContent(paused: Boolean, duration: Int) { val screenWidth = LocalConfiguration.current.screenWidthDp.dp - val decreaseRate = remember { 1f / currencyDrawableList.size } - val designItemHeight = remember { 82.dp } BoxWithGradient { Column(modifier = Modifier.graphicsLayer(clip = false)) { - currencyDrawableList.forEachIndexed { index, drawableResId -> + currencyDrawables.forEachIndexed { index, drawableResId -> val painter = painterResource(id = drawableResId) - val scaledItemSize = scaleToDesignSize(painter.dpSize(), designItemHeight = designItemHeight) + val scaledItemSize = scaleToDesignSize(painter.dpSize(), designItemHeight = currencyDesignItemHeight) val itemOversizedScreenWidthBy = scaledItemSize.width - screenWidth val moveItemToStartOfScreen = itemOversizedScreenWidthBy / 2 val chessOffset = if (index.isEven()) 0.dp else scaledItemSize.halfHeight() val animateFrom = chessOffset - moveItemToStartOfScreen - val animateTo = 50.dp - 50.dp * index * decreaseRate + val animateTo = 50.dp - 50.dp * index * currencyDecreaseRate HorizontalSlidingImage( paused = paused, @@ -65,34 +75,21 @@ fun StoriesCurrenciesContent(paused: Boolean, duration: Int) { } } -@Suppress("MagicNumber") @Composable -fun StoriesWeb3Content(paused: Boolean, duration: Int) { - val dappsItemList = remember { - listOf( - R.drawable.dapps1, - R.drawable.dapps1, - R.drawable.dapps2, - R.drawable.dapps3, - R.drawable.dapps4, - R.drawable.dapps5, - ) - } +internal fun StoriesWeb3Content(paused: Boolean, duration: Int) { val screenWidth = LocalConfiguration.current.screenWidthDp.dp - val decreaseRate = remember { 1f / dappsItemList.size } - val designItemHeight = 75.dp BoxWithGradient { Column(modifier = Modifier.graphicsLayer(clip = false)) { - dappsItemList.forEachIndexed { index, drawableResId -> + web3DappDrawables.forEachIndexed { index, drawableResId -> val painter = painterResource(id = drawableResId) - val scaledItemSize = scaleToDesignSize(painter.dpSize(), designItemHeight = designItemHeight) + val scaledItemSize = scaleToDesignSize(painter.dpSize(), designItemHeight = web3DesignItemHeight) val itemOversizedScreenWidthBy = scaledItemSize.width - screenWidth val moveItemToStartOfScreen = itemOversizedScreenWidthBy / 2 - val chessOffset = if (index.isEven()) 0.dp else scaledItemSize.width / 3 + val chessOffset = if (index.isEven()) 0.dp else scaledItemSize.width / WEB3_CHESS_OFFSET_DIVIDER val animateFrom = chessOffset - moveItemToStartOfScreen - val animateTo = 70.dp - 70.dp * index * decreaseRate + val animateTo = 70.dp - 70.dp * index * web3DecreaseRate HorizontalSlidingImage( paused = paused, @@ -138,6 +135,6 @@ private val BottomGradient: Brush = Brush.verticalGradient( ), ) -fun DpSize.halfHeight(): Dp = this.height / 2 +private fun DpSize.halfHeight(): Dp = this.height / 2 -fun Int.isEven() = this and 1 == 0 \ No newline at end of file +private fun Int.isEven() = this and 1 == 0 \ No newline at end of file diff --git a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/content/FirstStoriesContent.kt b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/content/FirstStoriesContent.kt index f7f6debd9c..768710d2ca 100644 --- a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/content/FirstStoriesContent.kt +++ b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/content/FirstStoriesContent.kt @@ -13,7 +13,6 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.TextStyle @@ -21,16 +20,21 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.sp +import com.tangem.core.ui.R import com.tangem.core.ui.components.SpacerH import com.tangem.core.ui.extensions.stringResourceSafe import com.tangem.core.ui.res.TangemColorPalette import com.tangem.core.ui.res.TangemTheme import com.tangem.features.home.impl.ui.compose.StoriesTextAnimation -import com.tangem.core.ui.R -@Suppress("LongMethod", "ComplexMethod", "MagicNumber") +private val firstStoryTitleStyle = TextStyle( + fontSize = 46.sp, + fontWeight = FontWeight.SemiBold, + textAlign = TextAlign.Center, +) + @Composable -fun FirstStoriesContent(isPaused: Boolean, duration: Int) { +internal fun FirstStoriesContent(isPaused: Boolean, duration: Int) { val progress = remember { Animatable(0f) } LaunchedEffect(isPaused) { @@ -47,16 +51,8 @@ fun FirstStoriesContent(isPaused: Boolean, duration: Int) { } } - val style = TextStyle( - fontSize = 46.sp, - fontWeight = FontWeight.SemiBold, - color = Color.White, - textAlign = TextAlign.Center, - ) - Column( - modifier = Modifier - .fillMaxSize(), + modifier = Modifier.fillMaxSize(), horizontalAlignment = Alignment.CenterHorizontally, ) { SpacerH(TangemTheme.dimens.spacing94) @@ -67,15 +63,14 @@ fun FirstStoriesContent(isPaused: Boolean, duration: Int) { Text( modifier = modifier, text = stringResourceSafe(R.string.story_meet_title), - style = style, + style = firstStoryTitleStyle, color = TangemColorPalette.White, textAlign = TextAlign.Center, ) } SpacerH(TangemTheme.dimens.spacing46) Image( - modifier = Modifier - .fillMaxWidth(), + modifier = Modifier.fillMaxWidth(), painter = painterResource(R.drawable.img_meet_tangem), contentScale = ContentScale.Inside, contentDescription = "Tangem Wallet card", @@ -86,8 +81,5 @@ fun FirstStoriesContent(isPaused: Boolean, duration: Int) { @Preview @Composable private fun FirstStoriesPreview() { - FirstStoriesContent( - false, - 8000, - ) + FirstStoriesContent(isPaused = false, duration = 8000) } \ No newline at end of file diff --git a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/content/FloatingCardsContent.kt b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/content/FloatingCardsContent.kt index e846781ec0..be1c61eda9 100644 --- a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/content/FloatingCardsContent.kt +++ b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/content/FloatingCardsContent.kt @@ -1,40 +1,56 @@ package com.tangem.features.home.impl.ui.compose.content +import androidx.annotation.DrawableRes import androidx.compose.foundation.Image import androidx.compose.foundation.layout.* import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.ImageBitmap import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.res.painterResource import com.tangem.core.ui.R import com.tangem.core.ui.utils.AnimatedValue -import com.tangem.core.ui.utils.asImageBitmap import com.tangem.core.ui.utils.toAnimatable /** [REDACTED_AUTHOR] */ @Composable -fun FloatingCardsContent(isPaused: Boolean, stepDuration: Int) { - val imageBitmap = asImageBitmap(R.drawable.img_card_placeholder_wallet_2) - val cards = listOf( - FloatingCard.first(), - FloatingCard.second(), - FloatingCard.third(), - ) - +internal fun FloatingCardsContent(isPaused: Boolean, stepDuration: Int) { Box(modifier = Modifier.fillMaxSize()) { - cards.forEach { floatingCard -> - FloatingCard.Item( + floatingCards.forEach { cardValues -> + FloatingCardItem( isPaused = isPaused, - imageBitmap = imageBitmap, - cardValues = floatingCard, + imageRes = R.drawable.img_card_placeholder_wallet_2, + cardValues = cardValues, stepDuration = stepDuration, ) } } } +@Composable +private fun FloatingCardItem( + isPaused: Boolean, + stepDuration: Int, + @DrawableRes imageRes: Int, + cardValues: CardValues, +) { + Image( + painter = painterResource(imageRes), + contentDescription = null, + modifier = Modifier + .graphicsLayer( + translationX = cardValues.translateX.toAnimatable(isPaused, stepDuration).value, + translationY = cardValues.translateY.toAnimatable(isPaused, stepDuration).value, + rotationX = cardValues.rotationX.toAnimatable(isPaused, stepDuration).value, + rotationY = cardValues.rotationY.toAnimatable(isPaused, stepDuration).value, + rotationZ = cardValues.rotationZ.toAnimatable(isPaused, stepDuration).value, + scaleX = cardValues.scale.toAnimatable(isPaused, stepDuration).value, + scaleY = cardValues.scale.toAnimatable(isPaused, stepDuration).value, + ), + ) +} + private data class CardValues( val translateX: AnimatedValue = AnimatedValue(0f, 0f), val translateY: AnimatedValue = AnimatedValue(0f, 0f), @@ -44,54 +60,30 @@ private data class CardValues( val scale: AnimatedValue = AnimatedValue(1f, 1f), ) -private object FloatingCard { - - @Suppress("TopLevelComposableFunctions") - @Composable - fun Item(isPaused: Boolean, stepDuration: Int, imageBitmap: ImageBitmap, cardValues: CardValues) { - Image( - bitmap = imageBitmap, - contentDescription = "Floating Tangem card", - modifier = Modifier - .graphicsLayer( - translationX = cardValues.translateX.toAnimatable(isPaused, stepDuration).value, - translationY = cardValues.translateY.toAnimatable(isPaused, stepDuration).value, - rotationX = cardValues.rotationX.toAnimatable(isPaused, stepDuration).value, - rotationY = cardValues.rotationY.toAnimatable(isPaused, stepDuration).value, - rotationZ = cardValues.rotationZ.toAnimatable(isPaused, stepDuration).value, - scaleX = cardValues.scale.toAnimatable(isPaused, stepDuration).value, - scaleY = cardValues.scale.toAnimatable(isPaused, stepDuration).value, - ), - ) - } - - @Suppress("MagicNumber") - fun first(): CardValues = CardValues( +@Suppress("MagicNumber") +private val floatingCards = listOf( + CardValues( translateX = -400f to -350f, translateY = 30f to 32f, rotationX = 10f to 15f, rotationY = 15f to 15f, rotationZ = 40f to 27f, scale = 0.6f to 0.6f, - ) - - @Suppress("MagicNumber") - fun second(): CardValues = CardValues( + ), + CardValues( translateX = 350f to 300f, translateY = -70f to 0f, rotationX = 30f to 48f, rotationY = 0f to 5f, rotationZ = -34f to -42f, scale = 0.47f to 0.35f, - ) - - @Suppress("MagicNumber") - fun third(): CardValues = CardValues( + ), + CardValues( translateX = 320f to 250f, translateY = 500f to 500f, rotationX = 0f to 3f, rotationY = 10f to 10f, rotationZ = -45f to -30f, scale = 0.6f to 0.75f, - ) -} \ No newline at end of file + ), +) \ No newline at end of file diff --git a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/content/Content.kt b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/content/StoriesContent.kt similarity index 89% rename from features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/content/Content.kt rename to features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/content/StoriesContent.kt index 33bf6db728..ff91838a5f 100644 --- a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/content/Content.kt +++ b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/content/StoriesContent.kt @@ -26,7 +26,7 @@ import com.tangem.features.home.impl.ui.compose.StoriesTextAnimation import com.tangem.core.ui.R @Composable -fun StoriesRevolutionaryWallet() { +internal fun StoriesRevolutionaryWallet() { SplitContent( topContent = { TopContent( @@ -45,7 +45,7 @@ fun StoriesRevolutionaryWallet() { } @Composable -fun StoriesUltraSecureBackup(isPaused: Boolean, stepDuration: Int) { +internal fun StoriesUltraSecureBackup(isPaused: Boolean, stepDuration: Int) { SplitContent( topContent = { TopContent( @@ -64,7 +64,7 @@ fun StoriesUltraSecureBackup(isPaused: Boolean, stepDuration: Int) { } @Composable -fun StoriesCurrencies(isPaused: Boolean, stepDuration: Int) { +internal fun StoriesCurrencies(isPaused: Boolean, stepDuration: Int) { SplitContent( topContent = { TopContent( @@ -80,7 +80,7 @@ fun StoriesCurrencies(isPaused: Boolean, stepDuration: Int) { } @Composable -fun StoriesWeb3(isPaused: Boolean, stepDuration: Int) { +internal fun StoriesWeb3(isPaused: Boolean, stepDuration: Int) { SplitContent( topContent = { TopContent( @@ -96,7 +96,7 @@ fun StoriesWeb3(isPaused: Boolean, stepDuration: Int) { } @Composable -fun StoriesWalletForEveryone(stepDuration: Int) { +internal fun StoriesWalletForEveryone(stepDuration: Int) { SplitContent( topContent = { TopContent( @@ -127,8 +127,7 @@ fun StoriesWalletForEveryone(stepDuration: Int) { @Composable private fun SplitContent(topContent: @Composable () -> Unit, bottomContent: @Composable () -> Unit) { Column( - modifier = Modifier - .fillMaxSize(), + modifier = Modifier.fillMaxSize(), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Top, ) { @@ -140,16 +139,11 @@ private fun SplitContent(topContent: @Composable () -> Unit, bottomContent: @Com @Composable private fun TopContent(titleText: String, subtitleText: String) { SpacerH(TangemTheme.dimens.spacing36) - StoriesTitleText( - text = titleText, - ) + StoriesTitleText(text = titleText) SpacerH16() - StoriesSubtitleText( - subtitleText = subtitleText, - ) + StoriesSubtitleText(subtitleText = subtitleText) } -@Suppress("MagicNumber") @Composable private fun StoriesTitleText(text: String) { StoriesTextAnimation( @@ -157,8 +151,7 @@ private fun StoriesTitleText(text: String) { slideInDelay = 150, ) { modifier -> Text( - modifier = modifier - .padding(start = 40.dp, end = 40.dp), + modifier = modifier.padding(horizontal = 40.dp), text = text, style = TangemTheme.typography.head, color = TangemColorPalette.White, @@ -167,7 +160,6 @@ private fun StoriesTitleText(text: String) { } } -@Suppress("MagicNumber") @Composable private fun StoriesSubtitleText(subtitleText: String) { StoriesTextAnimation( @@ -175,8 +167,7 @@ private fun StoriesSubtitleText(subtitleText: String) { slideInDelay = 400, ) { modifier -> Text( - modifier = modifier - .padding(start = 40.dp, end = 40.dp), + modifier = modifier.padding(horizontal = 40.dp), text = subtitleText, style = TangemTheme.typography.body1, color = TangemColorPalette.Dark1, diff --git a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/views/HomeButtons.kt b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/views/HomeButtons.kt deleted file mode 100644 index 5b0615495b..0000000000 --- a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/views/HomeButtons.kt +++ /dev/null @@ -1,105 +0,0 @@ -package com.tangem.features.home.impl.ui.compose.views - -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.padding -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.platform.testTag -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.tooling.preview.PreviewParameter -import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider -import com.tangem.core.ui.components.SpacerW12 -import com.tangem.core.ui.components.buttons.common.TangemButtonIconPosition -import com.tangem.core.ui.extensions.stringResourceSafe -import com.tangem.core.ui.res.TangemTheme -import com.tangem.core.ui.res.TangemThemePreview -import com.tangem.core.ui.test.StoriesScreenTestTags -import com.tangem.core.ui.R - -@Composable -internal fun HomeButtons( - btnScanStateInProgress: Boolean, - onScanButtonClick: () -> Unit, - onShopButtonClick: () -> Unit, - modifier: Modifier = Modifier, -) { - Row( - horizontalArrangement = Arrangement.SpaceEvenly, - modifier = modifier, - ) { - ScanCardButton( - modifier = Modifier - .weight(weight = 1f) - .testTag(StoriesScreenTestTags.SCAN_BUTTON), - showProgress = btnScanStateInProgress, - onClick = onScanButtonClick, - ) - SpacerW12() - OrderCardButton( - modifier = Modifier - .weight(weight = 1f) - .testTag(StoriesScreenTestTags.ORDER_BUTTON), - onClick = onShopButtonClick, - ) - } -} - -@Composable -private fun ScanCardButton(showProgress: Boolean, onClick: () -> Unit, modifier: Modifier = Modifier) { - StoriesButton( - modifier = modifier, - text = stringResourceSafe(id = R.string.home_button_scan), - useDarkerColors = false, - icon = TangemButtonIconPosition.End(iconResId = R.drawable.ic_tangem_24), - onClick = onClick, - showProgress = showProgress, - ) -} - -@Composable -private fun OrderCardButton(onClick: () -> Unit, modifier: Modifier = Modifier) { - StoriesButton( - modifier = modifier, - text = stringResourceSafe(id = R.string.home_button_order), - useDarkerColors = true, - onClick = onClick, - ) -} - -// region Preview -@Preview(showBackground = true, widthDp = 360) -@Composable -private fun HomeButtonsPreview(@PreviewParameter(HomeButtonsParameterProvider::class) state: HomeButtonsState) { - TangemThemePreview { - Box( - modifier = Modifier.background(Color.Black), - ) { - HomeButtons( - btnScanStateInProgress = state.btnScanStateInProgress, - onScanButtonClick = {}, - onShopButtonClick = {}, - modifier = Modifier.padding(all = TangemTheme.dimens.spacing16), - ) - } - } -} - -private class HomeButtonsParameterProvider : CollectionPreviewParameterProvider( - collection = listOf( - HomeButtonsState( - btnScanStateInProgress = false, - ), - HomeButtonsState( - btnScanStateInProgress = true, - ), - ), -) - -private data class HomeButtonsState( - val btnScanStateInProgress: Boolean, -) -// endregion Preview \ No newline at end of file diff --git a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/views/HomeButtonsV2.kt b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/views/HomeButtonsV2.kt index cd2c7ae621..67efafc969 100644 --- a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/views/HomeButtonsV2.kt +++ b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/views/HomeButtonsV2.kt @@ -24,7 +24,7 @@ internal fun HomeButtonsV2(onGetStartedClick: () -> Unit, modifier: Modifier = M verticalArrangement = Arrangement.spacedBy(8.dp), ) { StoriesButton( - modifier = modifier, + modifier = Modifier.fillMaxWidth(), text = stringResourceSafe(id = R.string.common_get_started), useDarkerColors = false, onClick = onGetStartedClick, diff --git a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/views/SearchCurrenciesButton.kt b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/views/SearchCurrenciesButton.kt deleted file mode 100644 index 0987e2193b..0000000000 --- a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/views/SearchCurrenciesButton.kt +++ /dev/null @@ -1,43 +0,0 @@ -package com.tangem.features.home.impl.ui.compose.views - -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.tooling.preview.Preview -import com.tangem.core.ui.components.buttons.common.TangemButtonIconPosition -import com.tangem.core.ui.extensions.stringResourceSafe -import com.tangem.core.ui.res.TangemTheme -import com.tangem.core.ui.res.TangemThemePreview -import com.tangem.core.ui.R - -@Composable -internal fun SearchCurrenciesButton(onClick: () -> Unit, modifier: Modifier = Modifier) { - StoriesButton( - modifier = modifier, - text = stringResourceSafe(id = R.string.common_search_tokens), - icon = TangemButtonIconPosition.Start(R.drawable.ic_search_24), - showProgress = false, - useDarkerColors = true, - onClick = onClick, - ) -} - -// region Preview -@Preview(showBackground = true, widthDp = 360) -@Composable -private fun SearchCurrenciesButtonPreview() { - TangemThemePreview { - Box( - modifier = Modifier - .background(color = Color.Black) - .padding(all = TangemTheme.dimens.spacing16), - ) { - SearchCurrenciesButton(modifier = Modifier.fillMaxWidth(), onClick = {}) - } - } -} -// endregion Preview \ No newline at end of file diff --git a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/views/StoriesProgressBar.kt b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/views/StoriesProgressBar.kt index 058d371b74..34886d6527 100644 --- a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/views/StoriesProgressBar.kt +++ b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/views/StoriesProgressBar.kt @@ -23,7 +23,7 @@ import kotlinx.coroutines.delay private const val STORIES_ANIMATION_SPEED_ZERO_DURATION = 3000L @Composable -fun StoriesProgressBar( +internal fun StoriesProgressBar( steps: Int, currentStep: Int, paused: Boolean = false, @@ -82,11 +82,11 @@ fun StoriesProgressBar( .clip(RoundedCornerShape(TangemTheme.dimens.radius2)) .background(TangemColorPalette.White) .fillMaxHeight() - .let { + .let { progressModifier -> when (index) { - currentStep -> it.fillMaxWidth(progress.value) - in 0 until currentStep -> it.fillMaxWidth(fraction = 1f) - else -> it + currentStep -> progressModifier.fillMaxWidth(progress.value) + in 0 until currentStep -> progressModifier.fillMaxWidth(fraction = 1f) + else -> progressModifier } }, ) diff --git a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/state/HomeUM.kt b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/state/HomeUM.kt index 924ca985fb..1189f5dca3 100644 --- a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/state/HomeUM.kt +++ b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/state/HomeUM.kt @@ -1,12 +1,14 @@ package com.tangem.features.home.impl.ui.state +import com.tangem.core.ui.components.stories.model.StoriesContentConfig +import com.tangem.core.ui.components.stories.model.StoryConfig import kotlinx.collections.immutable.ImmutableList -data class HomeUM( - val scanInProgress: Boolean, +internal data class HomeUM( + val isScanInProgress: Boolean, + val isStoriesContainerEnabled: Boolean, val stories: ImmutableList, - val onShopClick: () -> Unit, - val onSearchTokensClick: () -> Unit, + val storiesConfig: HomeStoriesConfig, val onGetStartedClick: () -> Unit, ) { val firstStory: Stories get() = stories[0] @@ -14,7 +16,17 @@ data class HomeUM( fun stepOf(story: Stories): Int = stories.indexOf(story) } -enum class Stories(val duration: Int = 6000) { +/** + * Config for the redesigned Home stories ([StoriesContainer]). The Home intro loops forever and is + * not closable, so [isCloseButtonVisible] is `false` and [onClose] keeps its no-op default. + */ +internal data class HomeStoriesConfig( + override val stories: ImmutableList, + override val isRestartable: Boolean = true, + override val isCloseButtonVisible: Boolean = false, +) : StoriesContentConfig + +internal enum class Stories(override val duration: Int = 6000) : StoryConfig { TangemIntro, RevolutionaryWallet, UltraSecureBackup, @@ -26,6 +38,6 @@ enum class Stories(val duration: Int = 6000) { /** * For FCA restriction stories */ -fun getRestrictedStories(): List { +internal fun getRestrictedStories(): List { return Stories.entries.filterNot { it == Stories.Currencies } } \ No newline at end of file diff --git a/features/home/impl/src/test/kotlin/com/tangem/features/home/impl/model/HomeModelTest.kt b/features/home/impl/src/test/kotlin/com/tangem/features/home/impl/model/HomeModelTest.kt new file mode 100644 index 0000000000..4879b05357 --- /dev/null +++ b/features/home/impl/src/test/kotlin/com/tangem/features/home/impl/model/HomeModelTest.kt @@ -0,0 +1,207 @@ +package com.tangem.features.home.impl.model + +import arrow.core.right +import com.google.common.truth.Truth.assertThat +import com.tangem.common.routing.entity.InitScreenLaunchMode +import com.tangem.core.analytics.api.AnalyticsEventHandler +import com.tangem.core.decompose.model.MutableParamsContainer +import com.tangem.core.decompose.model.ParamsContainer +import com.tangem.core.decompose.navigation.Router +import com.tangem.core.decompose.ui.UiMessageSender +import com.tangem.domain.card.ScanCardProcessor +import com.tangem.domain.card.repository.CardSdkConfigRepository +import com.tangem.domain.common.wallets.UserWalletsListRepository +import com.tangem.domain.settings.repositories.SettingsRepository +import com.tangem.domain.settings.usercountry.GetUserCountryUseCase +import com.tangem.domain.settings.usercountry.models.UserCountry +import com.tangem.domain.wallets.builder.ColdUserWalletBuilder +import com.tangem.domain.wallets.usecase.SaveWalletUseCase +import com.tangem.feature.referral.domain.ShouldShowMobileWalletPromoUseCase +import com.tangem.features.home.api.HomeComponent +import com.tangem.features.home.api.HomeFeatureToggles +import com.tangem.features.home.impl.ui.state.Stories +import com.tangem.features.home.impl.ui.state.getRestrictedStories +import com.tangem.utils.coroutines.TestingCoroutineDispatcherProvider +import io.mockk.* +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.emptyFlow +import kotlinx.coroutines.flow.flowOf +import kotlinx.coroutines.test.StandardTestDispatcher +import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.advanceUntilIdle +import kotlinx.coroutines.test.runTest +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test + +@OptIn(ExperimentalCoroutinesApi::class) +internal class HomeModelTest { + + private val scanCardProcessor: ScanCardProcessor = mockk() + private val cardSdkConfigRepository: CardSdkConfigRepository = mockk(relaxed = true) + private val settingsRepository: SettingsRepository = mockk() + private val analyticsEventHandler: AnalyticsEventHandler = mockk(relaxed = true) + private val router: Router = mockk(relaxed = true) + private val getUserCountryUseCase: GetUserCountryUseCase = mockk() + private val coldUserWalletBuilderFactory: ColdUserWalletBuilder.Factory = mockk(relaxed = true) + private val saveWalletUseCase: SaveWalletUseCase = mockk(relaxed = true) + private val userWalletsListRepository: UserWalletsListRepository = mockk(relaxed = true) + private val shouldShowMobileWalletPromoUseCase: ShouldShowMobileWalletPromoUseCase = mockk(relaxed = true) + private val homeFeatureToggles: HomeFeatureToggles = mockk() + private val uiMessageSender: UiMessageSender = mockk(relaxed = true) + + private val progressSlot = slot Unit>() + + @BeforeEach + fun setUp() { + every { homeFeatureToggles.isStoriesContainerEnabled } returns false + every { getUserCountryUseCase.invoke() } returns emptyFlow() + coEvery { settingsRepository.shouldSaveAccessCodes() } returns false + coEvery { + scanCardProcessor.scan( + analyticsSource = any(), + shouldCheckIsAlreadyActivated = any(), + cardId = any(), + onProgressStateChange = capture(progressSlot), + onWalletNotCreated = any(), + onCancel = any(), + onFailure = any(), + onSuccess = any(), + ) + } just Runs + } + + @Test + fun `GIVEN toggle enabled WHEN model created THEN isStoriesContainerEnabled is true`() = runTest { + // Arrange + every { homeFeatureToggles.isStoriesContainerEnabled } returns true + + // Act + val model = createModel(testScope = this) + advanceUntilIdle() + + // Assert + assertThat(model.uiState.value.isStoriesContainerEnabled).isTrue() + model.onDestroy() + } + + @Test + fun `GIVEN toggle disabled WHEN model created THEN isStoriesContainerEnabled is false`() = runTest { + // Arrange + every { homeFeatureToggles.isStoriesContainerEnabled } returns false + + // Act + val model = createModel(testScope = this) + advanceUntilIdle() + + // Assert + assertThat(model.uiState.value.isStoriesContainerEnabled).isFalse() + model.onDestroy() + } + + @Test + fun `GIVEN model created WHEN no country emitted THEN storiesConfig is non-closable looping and in sync`() = + runTest { + // Act + val model = createModel(testScope = this) + advanceUntilIdle() + + // Assert + val state = model.uiState.value + assertThat(state.storiesConfig.isRestartable).isTrue() + assertThat(state.storiesConfig.isCloseButtonVisible).isFalse() + assertThat(state.storiesConfig.stories).isEqualTo(state.stories) + assertThat(state.stories).containsExactlyElementsIn(getRestrictedStories()).inOrder() + model.onDestroy() + } + + @Test + fun `GIVEN FCA-restricted country WHEN model created THEN Currencies excluded and config in sync`() = runTest { + // Arrange + every { getUserCountryUseCase.invoke() } returns flowOf(UserCountry.Other(code = "GB").right()) + + // Act + val model = createModel(testScope = this) + advanceUntilIdle() + + // Assert + val state = model.uiState.value + assertThat(state.stories).containsExactlyElementsIn(getRestrictedStories()).inOrder() + assertThat(state.stories).doesNotContain(Stories.Currencies) + assertThat(state.storiesConfig.stories).isEqualTo(state.stories) + model.onDestroy() + } + + @Test + fun `GIVEN non-restricted country WHEN model created THEN all stories shown and config in sync`() = runTest { + // Arrange + every { getUserCountryUseCase.invoke() } returns flowOf(UserCountry.Russia.right()) + + // Act + val model = createModel(testScope = this) + advanceUntilIdle() + + // Assert + val state = model.uiState.value + assertThat(state.stories).containsExactlyElementsIn(Stories.entries).inOrder() + assertThat(state.storiesConfig.stories).isEqualTo(state.stories) + model.onDestroy() + } + + @Test + fun `GIVEN scan in progress WHEN loading toggles THEN storiesConfig instance is not replaced`() = runTest { + // Arrange + val model = createModel(testScope = this, launchMode = InitScreenLaunchMode.WithCardScan) + advanceUntilIdle() + val initialConfig = model.uiState.value.storiesConfig + + // Act + Assert — loading on + progressSlot.captured.invoke(true) + advanceUntilIdle() + assertThat(model.uiState.value.isScanInProgress).isTrue() + assertThat(model.uiState.value.storiesConfig).isSameInstanceAs(initialConfig) + + // Act + Assert — loading off + progressSlot.captured.invoke(false) + advanceUntilIdle() + assertThat(model.uiState.value.isScanInProgress).isFalse() + assertThat(model.uiState.value.storiesConfig).isSameInstanceAs(initialConfig) + + model.onDestroy() + } + + private fun createModel( + testScope: TestScope, + launchMode: InitScreenLaunchMode = InitScreenLaunchMode.Standard, + paramsContainer: ParamsContainer = MutableParamsContainer( + value = HomeComponent.Params(launchMode = launchMode), + ), + ): HomeModel { + return HomeModel( + paramsContainer = paramsContainer, + dispatchers = testScope.createTestingCoroutineDispatcherProvider(), + scanCardProcessor = scanCardProcessor, + cardSdkConfigRepository = cardSdkConfigRepository, + settingsRepository = settingsRepository, + analyticsEventHandler = analyticsEventHandler, + router = router, + getUserCountryUseCase = getUserCountryUseCase, + coldUserWalletBuilderFactory = coldUserWalletBuilderFactory, + saveWalletUseCase = saveWalletUseCase, + userWalletsListRepository = userWalletsListRepository, + shouldShowMobileWalletPromoUseCase = shouldShowMobileWalletPromoUseCase, + homeFeatureToggles = homeFeatureToggles, + uiMessageSender = uiMessageSender, + ) + } + + private fun TestScope.createTestingCoroutineDispatcherProvider(): TestingCoroutineDispatcherProvider { + val testDispatcher = StandardTestDispatcher(testScheduler) + return TestingCoroutineDispatcherProvider( + main = testDispatcher, + mainImmediate = testDispatcher, + io = testDispatcher, + default = testDispatcher, + single = testDispatcher, + ) + } +} \ No newline at end of file diff --git a/features/hot-wallet/impl/src/test/kotlin/com/tangem/features/hotwallet/walletbackup/model/WalletBackupModelTest.kt b/features/hot-wallet/impl/src/test/kotlin/com/tangem/features/hotwallet/walletbackup/model/WalletBackupModelTest.kt index ddf4d1d425..b8d9a569c8 100644 --- a/features/hot-wallet/impl/src/test/kotlin/com/tangem/features/hotwallet/walletbackup/model/WalletBackupModelTest.kt +++ b/features/hot-wallet/impl/src/test/kotlin/com/tangem/features/hotwallet/walletbackup/model/WalletBackupModelTest.kt @@ -14,7 +14,7 @@ import com.tangem.core.ui.message.DialogMessage import com.tangem.domain.models.wallet.UserWallet import com.tangem.domain.models.wallet.UserWalletId import com.tangem.domain.wallets.analytics.WalletSettingsAnalyticEvents -import com.tangem.domain.wallets.models.GetUserWalletError +import com.tangem.domain.wallets.models.errors.GetUserWalletError import com.tangem.domain.wallets.usecase.GetUserWalletUseCase import com.tangem.domain.wallets.usecase.UnlockHotWalletContextualUseCase import com.tangem.features.hotwallet.WalletBackupComponent diff --git a/features/onramp/api/src/main/kotlin/com/tangem/features/onramp/component/SwapSelectTokensComponent.kt b/features/onramp/api/src/main/kotlin/com/tangem/features/onramp/component/SwapSelectTokensComponent.kt deleted file mode 100644 index 279c7b4747..0000000000 --- a/features/onramp/api/src/main/kotlin/com/tangem/features/onramp/component/SwapSelectTokensComponent.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.tangem.features.onramp.component - -import com.tangem.core.decompose.factory.ComponentFactory -import com.tangem.core.ui.decompose.ComposableContentComponent -import com.tangem.domain.models.wallet.UserWalletId - -/** - * Swap select tokens component - * -[REDACTED_AUTHOR] - */ -interface SwapSelectTokensComponent : ComposableContentComponent { - - interface Factory : ComponentFactory - - /** - * Params - * - * @property userWalletId user wallet id - */ - data class Params(val userWalletId: UserWalletId) -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/DefaultSwapSelectTokensComponent.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/DefaultSwapSelectTokensComponent.kt deleted file mode 100644 index d18755aaf4..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/DefaultSwapSelectTokensComponent.kt +++ /dev/null @@ -1,109 +0,0 @@ -package com.tangem.features.onramp.swap - -import androidx.compose.runtime.Composable -import androidx.compose.runtime.Stable -import androidx.compose.runtime.getValue -import androidx.compose.ui.Modifier -import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.arkivanov.decompose.ComponentContext -import com.arkivanov.decompose.extensions.compose.subscribeAsState -import com.arkivanov.decompose.router.slot.childSlot -import com.tangem.core.analytics.api.AnalyticsEventHandler -import com.tangem.core.analytics.models.event.MainScreenAnalyticsEvent -import com.tangem.core.decompose.context.AppComponentContext -import com.tangem.core.decompose.context.child -import com.tangem.core.decompose.context.childByContext -import com.tangem.core.decompose.model.getOrCreateModel -import com.tangem.core.ui.decompose.ComposableBottomSheetComponent -import com.tangem.features.commonfeatures.api.addtoportfolio.AddToPortfolioComponent -import com.tangem.features.onramp.component.SwapSelectTokensComponent -import com.tangem.features.onramp.swap.availablepairs.AvailableSwapPairsComponent -import com.tangem.features.onramp.swap.availablepairs.model.AddToPortfolioRoute -import com.tangem.features.onramp.swap.model.SwapSelectTokensModel -import com.tangem.features.onramp.swap.ui.SwapSelectTokens -import com.tangem.features.onramp.tokenlist.OnrampTokenListComponent -import com.tangem.features.onramp.tokenlist.entity.OnrampOperation -import dagger.assisted.Assisted -import dagger.assisted.AssistedFactory -import dagger.assisted.AssistedInject - -@Stable -internal class DefaultSwapSelectTokensComponent @AssistedInject constructor( - tokenListComponentFactory: OnrampTokenListComponent.Factory, - availableSwapPairsComponentFactory: AvailableSwapPairsComponent.Factory, - analyticsEventHandler: AnalyticsEventHandler, - private val addToPortfolioComponentFactory: AddToPortfolioComponent.Factory, - @Assisted private val appComponentContext: AppComponentContext, - @Assisted private val params: SwapSelectTokensComponent.Params, -) : AppComponentContext by appComponentContext, SwapSelectTokensComponent { - - private val model: SwapSelectTokensModel = getOrCreateModel(params) - - private val selectFromTokenListComponent: OnrampTokenListComponent = tokenListComponentFactory.create( - context = child(key = "select_from_token_list"), - params = OnrampTokenListComponent.Params( - filterOperation = OnrampOperation.SWAP, - userWalletId = params.userWalletId, - onTokenClick = model::selectFromToken, - ), - ) - - private val selectToTokenListComponent: AvailableSwapPairsComponent = availableSwapPairsComponentFactory.create( - context = child(key = "select_to_token_list"), - params = AvailableSwapPairsComponent.Params( - userWalletId = params.userWalletId, - selectedStatus = model.fromCurrencyStatus, - onTokenClick = model::selectToToken, - ), - ) - - private val bottomSheetSlot = childSlot( - source = selectToTokenListComponent.bottomSheetNavigation, - serializer = AddToPortfolioRoute.serializer(), - key = "add_to_portfolio_bottom_sheet", - handleBackButton = false, - childFactory = { _, context -> bottomSheetChild(context) }, - ) - - init { - analyticsEventHandler.send(event = MainScreenAnalyticsEvent.SwapScreenOpened()) - } - - @Suppress("UnsafeCallOnNullableType") - private fun bottomSheetChild(componentContext: ComponentContext): ComposableBottomSheetComponent { - return addToPortfolioComponentFactory.create( - context = childByContext(componentContext), - params = AddToPortfolioComponent.Params( - addToPortfolioManager = selectToTokenListComponent.addToPortfolioManager, - ), - ) - } - - @Composable - override fun Content(modifier: Modifier) { - val state by model.state.collectAsStateWithLifecycle() - val fromTokensState by selectFromTokenListComponent.uiState.collectAsStateWithLifecycle() - val toTokensState by selectToTokenListComponent.uiState.collectAsStateWithLifecycle() - val bottomSheet by bottomSheetSlot.subscribeAsState() - - SwapSelectTokens( - state = state, - selectFromTokenListComponent = selectFromTokenListComponent, - selectFromTokenListState = fromTokensState, - selectToTokenListComponent = selectToTokenListComponent, - selectToTokenListState = toTokensState, - modifier = modifier, - ) - - bottomSheet.child?.instance?.BottomSheet() - } - - @AssistedFactory - interface Factory : SwapSelectTokensComponent.Factory { - - override fun create( - context: AppComponentContext, - params: SwapSelectTokensComponent.Params, - ): DefaultSwapSelectTokensComponent - } -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/AvailableSwapPairsComponent.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/AvailableSwapPairsComponent.kt deleted file mode 100644 index 2292f1bdf8..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/AvailableSwapPairsComponent.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.tangem.features.onramp.swap.availablepairs - -import androidx.compose.runtime.Stable -import com.arkivanov.decompose.router.slot.SlotNavigation -import com.tangem.core.decompose.factory.ComponentFactory -import com.tangem.core.ui.components.token.state.TokenItemState -import com.tangem.core.ui.decompose.ComposableListContentComponent -import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.domain.models.wallet.UserWalletId -import com.tangem.features.commonfeatures.api.addtoportfolio.AddToPortfolioManager -import com.tangem.features.onramp.swap.availablepairs.model.AddToPortfolioRoute -import com.tangem.features.onramp.tokenlist.entity.TokenListUM -import kotlinx.coroutines.flow.StateFlow - -/** Token list component that present list of available tokens for swap */ -@Stable -internal interface AvailableSwapPairsComponent : ComposableListContentComponent { - - val bottomSheetNavigation: SlotNavigation - val addToPortfolioManager: AddToPortfolioManager - - /** Component factory */ - interface Factory : ComponentFactory - - /** - * Params - * - * @property userWalletId id of multi-currency wallet - * @property selectedStatus flow of selected status - * @property onTokenClick callback for token click - */ - data class Params( - val userWalletId: UserWalletId, - val selectedStatus: StateFlow, - val onTokenClick: (TokenItemState, CryptoCurrencyStatus) -> Unit, - ) -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/DefaultAvailableSwapPairsComponent.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/DefaultAvailableSwapPairsComponent.kt deleted file mode 100644 index 347d4ad933..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/DefaultAvailableSwapPairsComponent.kt +++ /dev/null @@ -1,44 +0,0 @@ -package com.tangem.features.onramp.swap.availablepairs - -import androidx.compose.foundation.lazy.LazyListScope -import androidx.compose.runtime.Stable -import androidx.compose.ui.Modifier -import com.arkivanov.decompose.router.slot.SlotNavigation -import com.tangem.core.decompose.context.AppComponentContext -import com.tangem.core.decompose.model.getOrCreateModel -import com.tangem.features.commonfeatures.api.addtoportfolio.AddToPortfolioManager -import com.tangem.features.onramp.swap.availablepairs.model.AddToPortfolioRoute -import com.tangem.features.onramp.swap.availablepairs.model.AvailableSwapPairsModel -import com.tangem.features.onramp.tokenlist.entity.TokenListUM -import com.tangem.features.onramp.tokenlist.ui.onrampSwapTokenList -import dagger.assisted.Assisted -import dagger.assisted.AssistedFactory -import dagger.assisted.AssistedInject -import kotlinx.coroutines.flow.StateFlow - -@Stable -internal class DefaultAvailableSwapPairsComponent @AssistedInject constructor( - @Assisted context: AppComponentContext, - @Assisted params: AvailableSwapPairsComponent.Params, -) : AvailableSwapPairsComponent, AppComponentContext by context { - - private val model: AvailableSwapPairsModel = getOrCreateModel(params) - - override val bottomSheetNavigation: SlotNavigation get() = model.bottomSheetNavigation - override val addToPortfolioManager: AddToPortfolioManager get() = model.addToPortfolioManager - - override val uiState: StateFlow - get() = model.state - - override fun LazyListScope.content(uiState: TokenListUM, modifier: Modifier) { - onrampSwapTokenList(state = uiState) - } - - @AssistedFactory - interface Factory : AvailableSwapPairsComponent.Factory { - override fun create( - context: AppComponentContext, - params: AvailableSwapPairsComponent.Params, - ): DefaultAvailableSwapPairsComponent - } -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/di/AvailableSwapPairsComponentModule.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/di/AvailableSwapPairsComponentModule.kt deleted file mode 100644 index 0f451e0008..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/di/AvailableSwapPairsComponentModule.kt +++ /dev/null @@ -1,20 +0,0 @@ -package com.tangem.features.onramp.swap.availablepairs.di - -import com.tangem.features.onramp.swap.availablepairs.AvailableSwapPairsComponent -import com.tangem.features.onramp.swap.availablepairs.DefaultAvailableSwapPairsComponent -import dagger.Binds -import dagger.Module -import dagger.hilt.InstallIn -import dagger.hilt.components.SingletonComponent -import javax.inject.Singleton - -@Module -@InstallIn(SingletonComponent::class) -internal interface AvailableSwapPairsComponentModule { - - @Binds - @Singleton - fun bindAvailableSwapPairsComponentFactory( - factory: DefaultAvailableSwapPairsComponent.Factory, - ): AvailableSwapPairsComponent.Factory -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/di/AvailableSwapPairsModelModule.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/di/AvailableSwapPairsModelModule.kt deleted file mode 100644 index b68b705703..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/di/AvailableSwapPairsModelModule.kt +++ /dev/null @@ -1,20 +0,0 @@ -package com.tangem.features.onramp.swap.availablepairs.di - -import com.tangem.core.decompose.di.ModelComponent -import com.tangem.core.decompose.model.Model -import com.tangem.features.onramp.swap.availablepairs.model.AvailableSwapPairsModel -import dagger.Binds -import dagger.Module -import dagger.hilt.InstallIn -import dagger.multibindings.ClassKey -import dagger.multibindings.IntoMap - -@Module -@InstallIn(ModelComponent::class) -internal interface AvailableSwapPairsModelModule { - - @Binds - @IntoMap - @ClassKey(AvailableSwapPairsModel::class) - fun bindAvailableSwapPairsModel(model: AvailableSwapPairsModel): Model -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/entity/transformers/SetErrorWarningTransformer.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/entity/transformers/SetErrorWarningTransformer.kt deleted file mode 100644 index d3410bd2dc..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/entity/transformers/SetErrorWarningTransformer.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.tangem.features.onramp.swap.availablepairs.entity.transformers - -import com.tangem.common.ui.notifications.NotificationUM -import com.tangem.feature.swap.domain.models.ExpressException -import com.tangem.features.onramp.tokenlist.entity.TokenListUM -import com.tangem.features.onramp.tokenlist.entity.TokenListUMTransformer -import kotlinx.collections.immutable.persistentListOf - -/** -[REDACTED_AUTHOR] - */ -internal class SetErrorWarningTransformer( - private val cause: Throwable, - private val onRefresh: () -> Unit, -) : TokenListUMTransformer { - - override fun transform(prevState: TokenListUM): TokenListUM { - return prevState.copy( - availableItems = persistentListOf(), - unavailableItems = persistentListOf(), - warning = NotificationUM.Warning.OnrampErrorNotification( - errorCode = (cause as? ExpressException)?.expressDataError?.code?.toString(), - onRefresh = onRefresh, - ), - ) - } -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/entity/transformers/SetLoadingTokenItemsTransformer.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/entity/transformers/SetLoadingTokenItemsTransformer.kt deleted file mode 100644 index 02b9d632dc..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/entity/transformers/SetLoadingTokenItemsTransformer.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.tangem.features.onramp.swap.availablepairs.entity.transformers - -import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.onramp.swap.availablepairs.entity.converters.LoadingTokenListItemConverter -import com.tangem.features.onramp.tokenlist.entity.TokenListUM -import com.tangem.features.onramp.tokenlist.entity.TokenListUMTransformer -import kotlinx.collections.immutable.persistentListOf -import kotlinx.collections.immutable.toImmutableList - -/** - * Set [statuses] as loading items - * -[REDACTED_AUTHOR] - */ -internal class SetLoadingTokenItemsTransformer( - private val statuses: List, -) : TokenListUMTransformer { - - override fun transform(prevState: TokenListUM): TokenListUM { - return prevState.copy( - availableItems = LoadingTokenListItemConverter.convertList( - input = statuses.map(CryptoCurrencyStatus::currency), - ).toImmutableList(), - unavailableItems = persistentListOf(), - warning = null, - ) - } -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/entity/transformers/SetNoAvailablePairsTransformer.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/entity/transformers/SetNoAvailablePairsTransformer.kt deleted file mode 100644 index 08f93f0bd0..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/entity/transformers/SetNoAvailablePairsTransformer.kt +++ /dev/null @@ -1,66 +0,0 @@ -package com.tangem.features.onramp.swap.availablepairs.entity.transformers - -import com.tangem.common.ui.account.AccountCryptoPortfolioItemStateConverter -import com.tangem.common.ui.account.TokensListPortfolioItemConverter -import com.tangem.common.ui.notifications.NotificationUM -import com.tangem.core.ui.components.tokenlist.state.TokensListItemUM -import com.tangem.core.ui.extensions.TextReference -import com.tangem.domain.appcurrency.model.AppCurrency -import com.tangem.domain.models.TotalFiatBalance -import com.tangem.domain.models.account.Account -import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.onramp.tokenlist.entity.TokenListUM -import com.tangem.features.onramp.tokenlist.entity.TokenListUMData -import com.tangem.features.onramp.tokenlist.entity.TokenListUMTransformer -import com.tangem.features.onramp.tokenlist.entity.utils.OnrampTokenItemStateConverterFactory -import kotlinx.collections.immutable.persistentListOf -import kotlinx.collections.immutable.toPersistentList - -internal class SetNoAvailablePairsTransformer( - private val appCurrency: AppCurrency, - private val accountList: Map>, - private val isBalanceHidden: Boolean, - private val isAccountsMode: Boolean, - private val unavailableErrorText: TextReference, -) : TokenListUMTransformer { - private val unavailableConverter = OnrampTokenItemStateConverterFactory - .createUnavailableItemConverterV2(appCurrency = appCurrency, unavailableErrorText = unavailableErrorText) - - override fun transform(prevState: TokenListUM): TokenListUM { - val totalTokensCount = accountList.values.sumOf { it.size } - - return prevState.copy( - availableItems = persistentListOf(), - unavailableItems = persistentListOf(), - tokensListData = if (isAccountsMode) { - TokenListUMData.AccountList( - tokensList = accountList.map { (account, cryptoCurrencies) -> - TokensListPortfolioItemConverter( - tokenItemUM = AccountCryptoPortfolioItemStateConverter( - appCurrency = appCurrency, - account = account, - onItemClick = null, - ).convert(TotalFiatBalance.Failed), - isExpanded = true, - isCollapsable = false, - tokens = unavailableConverter.convertList(cryptoCurrencies) - .map(TokensListItemUM::Token) - .toPersistentList(), - ).convert(Unit) - }.toPersistentList(), - totalTokensCount = totalTokensCount, - ) - } else { - TokenListUMData.TokenList( - tokensList = accountList.flatMap { (_, cryptoCurrencies) -> - unavailableConverter.convertList(cryptoCurrencies) - .map(TokensListItemUM::Token) - }.toPersistentList(), - totalTokensCount = totalTokensCount, - ) - }, - isBalanceHidden = isBalanceHidden, - warning = NotificationUM.Warning.SwapNoAvailablePair, - ) - } -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/market/SwapMarketsListBatchFlowManager.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/market/SwapMarketsListBatchFlowManager.kt deleted file mode 100644 index 5df10fda71..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/market/SwapMarketsListBatchFlowManager.kt +++ /dev/null @@ -1,252 +0,0 @@ -package com.tangem.features.onramp.swap.availablepairs.market - -import com.tangem.common.ui.markets.models.MarketsListItemUM -import com.tangem.domain.appcurrency.model.AppCurrency -import com.tangem.domain.markets.* -import com.tangem.domain.models.currency.CryptoCurrency -import com.tangem.features.onramp.swap.availablepairs.market.converter.SwapMarketsTokenItemConverter -import com.tangem.pagination.Batch -import com.tangem.pagination.BatchAction -import com.tangem.pagination.PaginationStatus -import com.tangem.utils.Provider -import com.tangem.utils.coroutines.CoroutineDispatcherProvider -import com.tangem.utils.coroutines.JobHolder -import com.tangem.utils.coroutines.saveIn -import kotlinx.collections.immutable.ImmutableList -import kotlinx.collections.immutable.persistentListOf -import kotlinx.collections.immutable.toImmutableList -import kotlinx.coroutines.* -import kotlinx.coroutines.flow.* - -@Suppress("LongParameterList") -internal class SwapMarketsListBatchFlowManager( - getMarketsTokenListFlowUseCase: GetMarketsTokenListFlowUseCase, - private val batchFlowType: GetMarketsTokenListFlowUseCase.BatchFlowType, - private val order: TokenMarketListConfig.Order, - private val currentAppCurrency: Provider, - private val currentSearchText: Provider, - private val modelScope: CoroutineScope, - private val dispatchers: CoroutineDispatcherProvider, -) { - private val actionsFlow = MutableSharedFlow>() - private val updateStateJob = JobHolder() - - private val batchFlow = getMarketsTokenListFlowUseCase( - batchingContext = TokenListBatchingContext( - actionsFlow = actionsFlow, - coroutineScope = modelScope, - ), - batchFlowType = batchFlowType, - ) - - private val resultBatches = MutableStateFlow(ResultBatches()) - private val uiBatches = resultBatches.map { it.uiBatches } - - val uiItems: StateFlow> - get() = uiBatches - .map { batches -> - batches.asSequence() - .map { it.data } - .flatten() - .toImmutableList() - } - .distinctUntilChanged() - .stateIn( - scope = modelScope, - started = SharingStarted.Eagerly, - initialValue = persistentListOf(), - ) - - val isInInitialLoadingErrorState = batchFlow.state - .map { it.status is PaginationStatus.InitialLoadingError } - .distinctUntilChanged() - .stateIn( - scope = modelScope, - started = SharingStarted.Eagerly, - initialValue = false, - ) - - val isSearchNotFoundState = batchFlow.state - .map { batchListState -> - currentSearchText().isNullOrEmpty().not() && - batchListState.status is PaginationStatus.EndOfPagination && - batchListState.data.isEmpty() - } - .distinctUntilChanged() - .stateIn( - scope = modelScope, - started = SharingStarted.Eagerly, - initialValue = false, - ) - - val totalCount: StateFlow = batchFlow.state - .map { it.totalCount } - .distinctUntilChanged() - .stateIn( - scope = modelScope, - started = SharingStarted.Eagerly, - initialValue = null, - ) - - init { - batchFlow.state - .map { it.data } - .distinctUntilChanged { a, b -> - a.size == b.size && - a.map { it.key } == b.map { it.key } && - a.map { it.data }.flatten() == b.map { it.data }.flatten() - } - .onEach { - coroutineScope { - launch { - updateState(it) - }.saveIn(updateStateJob) - } - } - .flowOn(dispatchers.default) - .launchIn(modelScope) - } - - private suspend fun updateState(newList: List>>, forceUpdate: Boolean = false) = - withContext(dispatchers.default) { - resultBatches.update { resultBatches -> - val items = resultBatches.uiBatches - val previousList = resultBatches.processedItems - - val converter = SwapMarketsTokenItemConverter(appCurrency = currentAppCurrency()) - - if (newList.isEmpty()) { - return@update ResultBatches(processedItems = emptyList()) - } - - val isInitialLoading = - forceUpdate || previousList.isNullOrEmpty() || newList.first().key != previousList.first().key - - val outItems = if (isInitialLoading) { - newList.map { batch -> - Batch( - key = batch.key, - data = converter.convertList(batch.data), - ) - } - } else { - if (previousList.size != newList.size) { - val keysToAdd = newList.map { it.key }.subtract(previousList.map { it.key }.toSet()) - val newBatches = newList.filter { keysToAdd.contains(it.key) } - - items + newBatches.map { batch -> - Batch( - key = batch.key, - data = converter.convertList(batch.data), - ) - } - } else { - items.mapIndexed { batchIndex, batch -> - val prevBatch = previousList[batchIndex] - val newBatch = newList[batchIndex] - if (prevBatch == newBatch) return@mapIndexed batch - - Batch( - key = batch.key, - data = batch.data.mapIndexed { index, marketsListItemUM -> - val prevItem = prevBatch.data.getOrNull(index) - val newItem = newBatch.data.getOrNull(index) - if (prevItem != null && newItem != null) { - converter.update(prevItem, marketsListItemUM, newItem) - } else { - newItem?.let { converter.convert(it) } ?: marketsListItemUM - } - }, - ) - } - } - } - - currentCoroutineContext().ensureActive() - - ResultBatches( - uiBatches = outItems, - processedItems = newList, - ) - } - } - - fun reload(searchText: String? = null) { - modelScope.launch { - resultBatches.value = ResultBatches() - actionsFlow.emit( - BatchAction.Reload( - requestParams = TokenMarketListConfig( - fiatPriceCurrency = currentAppCurrency().code, - searchText = if (currentSearchText() == null) { - null - } else { - searchText ?: currentSearchText() - }, - priceChangeInterval = TokenMarketListConfig.Interval.H24, - order = order, - shouldNetworks = true, - ), - ), - ) - } - } - - fun loadMore() { - modelScope.launch { - actionsFlow.emit(BatchAction.LoadMore()) - } - } - - fun loadCharts(batchKeys: Set) { - if (batchKeys.isEmpty()) return - - modelScope.launch { - val currentData = batchFlow.state.value.data - val alreadyLoadedChartsBatchKeys = currentData - .filter { batch -> - val first = batch.data.firstOrNull() ?: return@filter false - first.tokenCharts.h24 != null - } - .map { it.key } - .toSet() - - val batchesKeysToLoad = batchKeys.minus(alreadyLoadedChartsBatchKeys) - - if (batchesKeysToLoad.isNotEmpty()) { - actionsFlow.emit( - BatchAction.UpdateBatches( - keys = batchesKeysToLoad, - updateRequest = TokenMarketUpdateRequest.UpdateChart( - interval = TokenMarketListConfig.Interval.H24, - currency = currentAppCurrency().code, - ), - async = true, - operationId = batchesKeysToLoad.toString() + "h24", - ), - ) - } - } - } - - fun getTokenMarketById(id: CryptoCurrency.RawID): TokenMarket? { - return batchFlow.state.value.data - .asSequence() - .flatMap { it.data } - .firstOrNull { it.id == id } - } - - fun getBatchKeysByItemIds(ids: List): Set { - val currentData = batchFlow.state.value.data - - return currentData - .filter { d -> d.data.any { ids.contains(it.id) } } - .map { it.key } - .toSet() - } - - private data class ResultBatches( - val uiBatches: List>> = emptyList(), - val processedItems: List>>? = null, - ) -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/market/converter/SwapMarketsTokenItemConverter.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/market/converter/SwapMarketsTokenItemConverter.kt deleted file mode 100644 index 98a4c621b3..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/market/converter/SwapMarketsTokenItemConverter.kt +++ /dev/null @@ -1,161 +0,0 @@ -package com.tangem.features.onramp.swap.availablepairs.market.converter - -import com.tangem.common.ui.charts.state.MarketChartData -import com.tangem.common.ui.charts.state.MarketChartRawData -import com.tangem.common.ui.charts.state.converter.PriceAndTimePointValuesConverter -import com.tangem.common.ui.charts.state.sorted -import com.tangem.common.ui.markets.models.MarketsListItemUM -import com.tangem.common.ui.markets.toMarketsListItemPriceAnnotated -import com.tangem.core.ui.R -import com.tangem.core.ui.components.marketprice.PriceChangeType -import com.tangem.core.ui.extensions.resourceReference -import com.tangem.core.ui.extensions.wrappedList -import com.tangem.core.ui.format.bigdecimal.compact -import com.tangem.core.ui.format.bigdecimal.fiat -import com.tangem.core.ui.format.bigdecimal.format -import com.tangem.core.ui.format.bigdecimal.percent -import com.tangem.core.ui.format.bigdecimal.price -import com.tangem.domain.appcurrency.model.AppCurrency -import com.tangem.domain.markets.TokenMarket -import com.tangem.utils.converter.Converter -import kotlinx.collections.immutable.toImmutableList -import java.math.BigDecimal -import java.math.RoundingMode - -internal class SwapMarketsTokenItemConverter( - private val appCurrency: AppCurrency, -) : Converter { - - private val priceAndTimePointValuesConverter = PriceAndTimePointValuesConverter(shouldFormatAxis = false) - - override fun convert(value: TokenMarket): MarketsListItemUM { - return MarketsListItemUM( - id = value.id, - name = value.name, - currencySymbol = value.symbol, - ratingPosition = value.marketRating?.toString(), - marketCap = value.getMarketCap(), - iconUrl = value.imageUrlLarge, - price = value.getCurrentPrice(), - trendPercentText = value.getTrendPercent(), - trendType = value.getTrendType(), - chartData = value.getChartData(), - isUnder100kMarketCap = value.isUnderMarketCapLimit, - stakingRate = value.yieldRate?.format { percent() }?.let { - resourceReference(R.string.markets_apy_placeholder, wrappedList(it)) - }, - updateTimestamp = value.updateTimestamp, - networks = value.networks?.map { network -> - MarketsListItemUM.Network( - networkId = network.networkId, - contractAddress = network.contractAddress, - decimalCount = network.decimalCount, - ) - }, - ) - } - - fun convertList(items: List): List = items.map(::convert) - - fun update(prev: TokenMarket, prevUI: MarketsListItemUM, new: TokenMarket): MarketsListItemUM { - require(prev.id == new.id) { - "Ids is not the same during update TokenMarket item: previousItem[${prev.id}] != newItem[${new.id}]" - } - - return prevUI.copy( - name = new.name, - currencySymbol = new.symbol, - ratingPosition = new.marketRating?.toString(), - marketCap = ifChanged(prev.marketCap, new.marketCap, prevUI.marketCap) { new.getMarketCap() }, - iconUrl = new.imageUrlLarge, - price = ifChanged(prev = prev.tokenQuotesShort, new = new.tokenQuotesShort, prevR = prevUI.price) { - new.getCurrentPrice(prev = prev) - }, - trendPercentText = ifChanged( - prev.tokenQuotesShort, - new.tokenQuotesShort, - prevUI.trendPercentText, - ) { new.getTrendPercent() }, - trendType = ifChanged(prev.tokenQuotesShort, new.tokenQuotesShort, prevUI.trendType) { new.getTrendType() }, - chartData = ifChanged(prev.tokenCharts, new.tokenCharts, prevUI.chartData) { new.getChartData() }, - ) - } - - private inline fun ifChanged(prev: T, new: T, prevR: R, force: Boolean = false, change: (T) -> R): R { - return if (force || prev != new) change(new) else prevR - } - - private fun TokenMarket.getMarketCap(): String? { - val value = marketCap?.takeIf { marketCap != BigDecimal.ZERO } ?: return null - - return value.format { - fiat( - fiatCurrencyCode = appCurrency.code, - fiatCurrencySymbol = appCurrency.symbol, - ).compact( - threeDigitsMethod = true, - ) - } - } - - private fun TokenMarket.getCurrentPrice(prev: TokenMarket? = null): MarketsListItemUM.Price { - val prevPrice = prev?.tokenQuotesShort?.currentPrice - - val priceText = tokenQuotesShort.currentPrice.format { - fiat( - fiatCurrencyCode = appCurrency.code, - fiatCurrencySymbol = appCurrency.symbol, - ).price() - } - - val changeType = if (prevPrice != null) { - if (tokenQuotesShort.currentPrice > prevPrice) { - PriceChangeType.UP - } else { - PriceChangeType.DOWN - } - } else { - null - } - - return MarketsListItemUM.Price( - text = priceText, - annotated = tokenQuotesShort.currentPrice.toMarketsListItemPriceAnnotated( - appCurrencyCode = appCurrency.code, - appCurrencySymbol = appCurrency.symbol, - ), - changeType = changeType, - fiatPrice = tokenQuotesShort.currentPrice, - ) - } - - private fun TokenMarket.getChartData(): MarketChartRawData? { - val chart = tokenCharts.h24 - - return chart?.let { ct -> - priceAndTimePointValuesConverter.convert( - MarketChartData.Data( - y = ct.priceY.toImmutableList(), - x = ct.timeStamps.map { it.toBigDecimal() }.toImmutableList(), - ).sorted(), - ) - } - } - - @Suppress("MagicNumber") - private fun TokenMarket.getTrendType(): PriceChangeType { - val percent = tokenQuotesShort.h24ChangePercent - val scaled = percent?.setScale(4, RoundingMode.HALF_UP) - return when { - scaled == null -> PriceChangeType.NEUTRAL - scaled > BigDecimal.ZERO -> PriceChangeType.UP - scaled < BigDecimal.ZERO -> PriceChangeType.DOWN - else -> PriceChangeType.NEUTRAL - } - } - - private fun TokenMarket.getTrendPercent(): String { - val percent = tokenQuotesShort.h24ChangePercent - return percent.format { percent() } - } -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/market/state/SwapMarketState.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/market/state/SwapMarketState.kt deleted file mode 100644 index 7e9abb3982..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/market/state/SwapMarketState.kt +++ /dev/null @@ -1,41 +0,0 @@ -package com.tangem.features.onramp.swap.availablepairs.market.state - -import androidx.compose.runtime.Immutable -import com.tangem.common.ui.markets.models.MarketsListItemUM -import com.tangem.core.ui.R -import com.tangem.core.ui.extensions.TextReference -import com.tangem.domain.models.currency.CryptoCurrency -import kotlinx.collections.immutable.ImmutableList - -@Immutable -internal sealed class SwapMarketState { - - abstract val marketsTitle: TextReference - abstract val shouldAssetsCount: Boolean - - data class Content( - val items: ImmutableList, - val total: Int, - val loadMore: () -> Unit, - val onItemClick: (MarketsListItemUM) -> Unit, - val visibleIdsChanged: (List) -> Unit, - override val marketsTitle: TextReference, - override val shouldAssetsCount: Boolean, - ) : SwapMarketState() - - data class Loading( - override val marketsTitle: TextReference, - override val shouldAssetsCount: Boolean, - ) : SwapMarketState() - - data class LoadingError( - val onRetryClicked: () -> Unit, - override val marketsTitle: TextReference, - override val shouldAssetsCount: Boolean, - ) : SwapMarketState() - - data object SearchNothingFound : SwapMarketState() { - override val marketsTitle: TextReference = TextReference.Res(R.string.markets_common_title) - override val shouldAssetsCount: Boolean = true - } -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/model/AddToPortfolioRoute.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/model/AddToPortfolioRoute.kt deleted file mode 100644 index 559ef6eb09..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/model/AddToPortfolioRoute.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.tangem.features.onramp.swap.availablepairs.model - -import com.tangem.core.decompose.navigation.Route -import kotlinx.serialization.Serializable - -@Serializable -internal data object AddToPortfolioRoute : Route \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/model/AvailableSwapPairsModel.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/model/AvailableSwapPairsModel.kt deleted file mode 100644 index d87b8d3d0e..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/model/AvailableSwapPairsModel.kt +++ /dev/null @@ -1,648 +0,0 @@ -package com.tangem.features.onramp.swap.availablepairs.model - -import com.arkivanov.decompose.router.slot.SlotNavigation -import com.arkivanov.decompose.router.slot.activate -import com.arkivanov.decompose.router.slot.dismiss -import com.tangem.blockchainsdk.utils.ExcludedBlockchains -import com.tangem.common.ui.markets.models.MarketsListItemUM -import com.tangem.core.analytics.api.AnalyticsEventHandler -import com.tangem.core.analytics.models.AnalyticsParam.ScreensSources -import com.tangem.core.analytics.models.event.SwapAnalyticsEvent -import com.tangem.core.decompose.model.Model -import com.tangem.core.decompose.model.ParamsContainer -import com.tangem.core.ui.components.fields.InputManager -import com.tangem.core.ui.components.token.state.TokenItemState -import com.tangem.core.ui.extensions.TextReference -import com.tangem.core.ui.extensions.resourceReference -import com.tangem.domain.account.status.producer.SingleAccountStatusListProducer -import com.tangem.domain.account.status.supplier.SingleAccountStatusListSupplier -import com.tangem.domain.account.status.usecase.GetAccountCurrencyStatusUseCase -import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase -import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase -import com.tangem.domain.appcurrency.model.AppCurrency -import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase -import com.tangem.domain.card.common.extensions.hotWalletExcludedBlockchains -import com.tangem.domain.core.lce.Lce -import com.tangem.domain.core.utils.lceContent -import com.tangem.domain.core.utils.lceError -import com.tangem.domain.core.utils.lceLoading -import com.tangem.domain.markets.GetMarketsTokenListFlowUseCase -import com.tangem.domain.markets.TokenMarketInfo -import com.tangem.domain.markets.TokenMarketListConfig -import com.tangem.domain.markets.toSerializableParam -import com.tangem.domain.models.account.Account -import com.tangem.domain.models.account.AccountStatus -import com.tangem.domain.models.account.filterCryptoPortfolio -import com.tangem.domain.models.currency.CryptoCurrency -import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.domain.models.tokenlist.TokenList -import com.tangem.domain.models.wallet.UserWallet -import com.tangem.domain.wallets.usecase.GetWalletsUseCase -import com.tangem.feature.swap.domain.GetAvailablePairsUseCase -import com.tangem.feature.swap.domain.models.domain.LeastTokenInfo -import com.tangem.feature.swap.domain.models.domain.SwapPairLeast -import com.tangem.features.commonfeatures.api.addtoportfolio.AddToPortfolioManager -import com.tangem.features.onramp.impl.R -import com.tangem.features.onramp.swap.availablepairs.AvailableSwapPairsComponent -import com.tangem.features.onramp.swap.availablepairs.entity.transformers.SetErrorWarningTransformer -import com.tangem.features.onramp.swap.availablepairs.entity.transformers.SetNoAvailablePairsTransformer -import com.tangem.features.onramp.swap.availablepairs.market.SwapMarketsListBatchFlowManager -import com.tangem.features.onramp.swap.availablepairs.market.state.SwapMarketState -import com.tangem.features.onramp.swap.entity.AccountAvailabilityUM -import com.tangem.features.onramp.swap.entity.AccountCurrencyUM -import com.tangem.features.onramp.tokenlist.entity.TokenListUM -import com.tangem.features.onramp.tokenlist.entity.TokenListUMController -import com.tangem.features.onramp.tokenlist.entity.TokenListUMTransformer -import com.tangem.features.onramp.tokenlist.entity.transformer.SetLoadingAccountTokenListTransformer -import com.tangem.features.onramp.tokenlist.entity.transformer.SetNothingToFoundStateTransformer -import com.tangem.features.onramp.tokenlist.entity.transformer.UpdateAccountTokenListTransformer -import com.tangem.features.onramp.tokenlist.entity.utils.OnrampTokenItemStateConverterFactory -import com.tangem.features.onramp.utils.ClearSearchBarTransformer -import com.tangem.features.onramp.utils.UpdateSearchBarActiveStateTransformer -import com.tangem.features.onramp.utils.UpdateSearchBarCallbacksTransformer -import com.tangem.features.onramp.utils.UpdateSearchQueryTransformer -import com.tangem.lib.crypto.BlockchainUtils -import com.tangem.utils.Provider -import com.tangem.utils.coroutines.CoroutineDispatcherProvider -import com.tangem.utils.coroutines.runSuspendCatching -import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.flow.* -import kotlinx.coroutines.launch -import javax.inject.Inject -import com.tangem.core.ui.R as CoreUiR - -private typealias AvailablePairsState = Lce> - -@Suppress("LongParameterList", "LargeClass") -internal class AvailableSwapPairsModel @Inject constructor( - paramsContainer: ParamsContainer, - override val dispatchers: CoroutineDispatcherProvider, - private val analyticsEventHandler: AnalyticsEventHandler, - private val tokenListUMController: TokenListUMController, - private val searchManager: InputManager, - private val getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase, - private val getBalanceHidingSettingsUseCase: GetBalanceHidingSettingsUseCase, - private val getAvailablePairsUseCase: GetAvailablePairsUseCase, - private val singleAccountStatusListSupplier: SingleAccountStatusListSupplier, - private val isAccountsModeEnabledUseCase: IsAccountsModeEnabledUseCase, - private val getMarketsTokenListFlowUseCase: GetMarketsTokenListFlowUseCase, - private val addToPortfolioManagerFactory: AddToPortfolioManager.Factory, - private val excludedBlockchains: ExcludedBlockchains, - private val getAccountCurrencyStatusUseCase: GetAccountCurrencyStatusUseCase, - getWalletsUseCase: GetWalletsUseCase, -) : Model() { - - val state: StateFlow = tokenListUMController.state - - private val params: AvailableSwapPairsComponent.Params = paramsContainer.require() - private val userWallet = getWalletsUseCase.invokeSync().first { it.walletId == params.userWalletId } - private val allUserWallets = getWalletsUseCase.invokeSync() - - val bottomSheetNavigation: SlotNavigation = SlotNavigation() - val addToPortfolioManager: AddToPortfolioManager = addToPortfolioManagerFactory - .create( - scope = modelScope, - analyticsParams = AddToPortfolioManager.AnalyticsParams(source = ScreensSources.Swap.value), - settings = AddToPortfolioManager.Settings.ChooseToken, - ) - - private val accountListFlow = getAccountListUseCaseFlow() - private val availablePairsByNetworkFlow = MutableStateFlow>(emptyMap()) - - private val selectedAppCurrencyFlow: StateFlow = getSelectedAppCurrencyUseCase.invokeOrDefault() - .stateIn(scope = modelScope, started = SharingStarted.Eagerly, initialValue = AppCurrency.Default) - private val refreshPairsTrigger = MutableSharedFlow() - private val searchQueryStateForMarkets = MutableStateFlow("") - private val visibleMarketItemIds = MutableStateFlow>(emptyList()) - - private val defaultMarketsListManager by lazy { - SwapMarketsListBatchFlowManager( - getMarketsTokenListFlowUseCase = getMarketsTokenListFlowUseCase, - batchFlowType = GetMarketsTokenListFlowUseCase.BatchFlowType.Main, - order = TokenMarketListConfig.Order.Trending, - currentAppCurrency = Provider { selectedAppCurrencyFlow.value }, - currentSearchText = Provider { null }, - modelScope = modelScope, - dispatchers = dispatchers, - ) - } - - private val searchMarketsListManager by lazy { - SwapMarketsListBatchFlowManager( - getMarketsTokenListFlowUseCase = getMarketsTokenListFlowUseCase, - batchFlowType = GetMarketsTokenListFlowUseCase.BatchFlowType.Search, - order = TokenMarketListConfig.Order.ByRating, - currentAppCurrency = Provider { selectedAppCurrencyFlow.value }, - currentSearchText = Provider { searchQueryStateForMarkets.value }, - modelScope = modelScope, - dispatchers = dispatchers, - ) - } - - private val visibleDefaultMarketItemIds = MutableStateFlow>(emptyList()) - - init { - subscribeOnUpdateState() - - initializeSearchBarCallbacks() - subscribeOnSelectedStatusChange() - subscribeOnAvailablePairsUpdates() - - subscribeOnMarketsUpdates() - subscribeOnVisibleMarketItems() - addToPortfolioManager.onDismiss.receiveAsFlow() - .onEach { bottomSheetNavigation.dismiss() } - .launchIn(modelScope) - addToPortfolioManager.onSuccessAdded.receiveAsFlow() - .onEach { result -> onTokenAddedToPortfolio(result.addedCurrency.currency) } - .launchIn(modelScope) - } - - private fun getAccountListUseCaseFlow(): SharedFlow> { - return singleAccountStatusListSupplier(SingleAccountStatusListProducer.Params(params.userWalletId)) - .distinctUntilChanged() - .mapNotNull { accountStatusList -> - accountStatusList.accountStatuses.filter { - it is AccountStatus.CryptoPortfolio && it.tokenList !is TokenList.Empty - } - } - .flowOn(dispatchers.default) - .shareIn(scope = modelScope, started = SharingStarted.Eagerly, replay = 1) - } - - private fun subscribeOnSelectedStatusChange() { - params.selectedStatus - .filter { it == null } - .onEach { clearSearchState() } - .launchIn(modelScope) - } - - private fun initializeSearchBarCallbacks() { - tokenListUMController.update( - transformer = UpdateSearchBarCallbacksTransformer( - onQueryChange = ::onSearchQueryChange, - onActiveChange = ::onSearchBarActiveChange, - ), - ) - } - - private fun subscribeOnUpdateState() { - combine( - flow = getAccountsAndModeFlow(), - flow2 = getAppCurrencyAndBalanceHidingFlow(), - flow3 = params.selectedStatus, - flow4 = searchManager.query, - flow5 = availablePairsByNetworkFlow - .map { it[params.selectedStatus.value?.toLeastTokenInfo()] } - .distinctUntilChanged(), - ) { accountListAndMode, appCurrencyAndBalanceHiding, selectedStatus, query, availablePairsState -> - val (accountList, isAccountsMode) = accountListAndMode - availablePairsState?.fold( - ifLoading = { - SetLoadingAccountTokenListTransformer( - appCurrency = appCurrencyAndBalanceHiding.first, - accountList = accountList, - isAccountsMode = isAccountsMode, - ) - }, - ifContent = { pairs -> - handleContentState( - appCurrencyAndBalanceHiding = appCurrencyAndBalanceHiding, - accountList = accountList, - selectedStatus = selectedStatus, - query = query, - availablePairs = pairs, - isAccountsMode = isAccountsMode, - ) - }, - ifError = { throwable -> - handleErrorState( - cause = throwable, - networkInfo = params.selectedStatus.value?.toLeastTokenInfo(), - accountList = accountList, - ) - }, - ) ?: SetLoadingAccountTokenListTransformer( - appCurrency = appCurrencyAndBalanceHiding.first, - accountList = accountList, - isAccountsMode = isAccountsMode, - ) - } - .onEach(tokenListUMController::update) - .flowOn(dispatchers.default) - .launchIn(modelScope) - } - - private fun handleContentState( - appCurrencyAndBalanceHiding: Pair, - accountList: List, - selectedStatus: CryptoCurrencyStatus?, - query: String, - availablePairs: List, - isAccountsMode: Boolean, - ): TokenListUMTransformer { - val (appCurrency, isBalanceHidden) = appCurrencyAndBalanceHiding - - val filterByQueryAccountList: Map> = accountList - .filterCryptoPortfolio() - .associate { accountStatus -> - val statuses = accountStatus.tokenList.flattenCurrencies() - .filterNot { status -> - status.currency.network.rawId == selectedStatus?.currency?.network?.rawId && - status.currency.id.contractAddress == selectedStatus.currency.id.contractAddress - } - .filterByQuery(query = query) - - accountStatus.account to statuses - } - .filterValues { it.isNotEmpty() } - - if (availablePairs.isEmpty()) { - return SetNoAvailablePairsTransformer( - appCurrency = appCurrency, - accountList = filterByQueryAccountList, - unavailableErrorText = resourceReference(R.string.tokens_list_unavailable_to_swap_source_header), - isBalanceHidden = isBalanceHidden, - isAccountsMode = isAccountsMode, - ) - } - - return if (query.isNotEmpty() && filterByQueryAccountList.isEmpty()) { - SetNothingToFoundStateTransformer( - isBalanceHidden = isBalanceHidden, - emptySearchMessageReference = resourceReference( - id = R.string.action_buttons_swap_empty_search_message, - ), - ) - } else { - UpdateAccountTokenListTransformer( - appCurrency = appCurrency, - onItemClick = ::onPortfolioTokenClick, - accountList = filterByQueryAccountList.filterByAvailability(availablePairs = availablePairs), - isBalanceHidden = isBalanceHidden, - unavailableErrorText = resourceReference(R.string.tokens_list_unavailable_to_swap_source_header), - isAccountsMode = isAccountsMode, - ) - } - } - - private fun handleErrorState( - cause: Throwable, - networkInfo: LeastTokenInfo?, - accountList: List, - ): SetErrorWarningTransformer { - return SetErrorWarningTransformer( - cause = cause, - onRefresh = { - modelScope.launch { - if (networkInfo != null) { - accountList.filterCryptoPortfolio() - .forEach { (_, currencies) -> - updateAvailablePairs(networkInfo, currencies.flattenCurrencies()) - } - } - } - }, - ) - } - - private fun subscribeOnAvailablePairsUpdates() { - modelScope.launch { - combine( - params.selectedStatus.filterNotNull(), - refreshPairsTrigger - .onEach { availablePairsByNetworkFlow.value = emptyMap() } - .onStart { emit(Unit) }, - ) { status, _ -> status } - .collectLatest { selectedStatus -> - val networkInfo = selectedStatus.toLeastTokenInfo() - - val isAlreadyLoaded = availablePairsByNetworkFlow.value[networkInfo]?.isContent() == true - if (isAlreadyLoaded) return@collectLatest - - val accountList = accountListFlow.firstOrNull() ?: return@collectLatest - updateAvailablePairs( - networkInfo = networkInfo, - statuses = accountList.filterCryptoPortfolio() - .flatMap { accountStatus -> - accountStatus.flattenCurrencies() - }.toSet().toList(), - ) - } - } - } - - private suspend fun updateAvailablePairs(networkInfo: LeastTokenInfo, statuses: List) { - runSuspendCatching { - availablePairsByNetworkFlow.update(networkInfo = networkInfo, state = lceLoading()) - - getAvailablePairsUseCase( - userWallet = userWallet, - initialCurrency = networkInfo, - currencies = statuses.map(CryptoCurrencyStatus::currency), - ) - } - .onSuccess { pairs -> - availablePairsByNetworkFlow.update(networkInfo = networkInfo, state = pairs.lceContent()) - } - .onFailure { cause -> - availablePairsByNetworkFlow.update(networkInfo = networkInfo, state = cause.lceError()) - } - } - - private fun MutableStateFlow>.update( - networkInfo: LeastTokenInfo, - state: AvailablePairsState, - ) { - update { map -> - map.toMutableMap().apply { - this[networkInfo] = state - } - } - } - - private fun getAppCurrencyAndBalanceHidingFlow(): Flow> { - return combine( - flow = getSelectedAppCurrencyUseCase.invokeOrDefault(), - flow2 = getBalanceHidingSettingsUseCase.isBalanceHidden(), - transform = ::Pair, - ) - } - - private fun getAccountsAndModeFlow(): Flow, Boolean>> { - return combine( - flow = accountListFlow.distinctUntilChanged(), - flow2 = isAccountsModeEnabledUseCase().distinctUntilChanged(), - transform = ::Pair, - ) - } - - private fun onSearchQueryChange(newQuery: String) { - if (state.value.searchBarUM.query == newQuery) return - - modelScope.launch { - tokenListUMController.update(transformer = UpdateSearchQueryTransformer(newQuery)) - - searchManager.update(newQuery) - - searchQueryStateForMarkets.value = newQuery - } - } - - private fun onSearchBarActiveChange(isActive: Boolean) { - tokenListUMController.update( - transformer = UpdateSearchBarActiveStateTransformer( - isActive = isActive, - placeHolder = resourceReference(id = R.string.common_search), - ), - ) - } - - private fun List.filterByQuery(query: String): List { - return filter { status -> - status.currency.name.contains(other = query, ignoreCase = true) || - status.currency.symbol.contains(other = query, ignoreCase = true) - } - } - - private fun Map>.filterByAvailability( - availablePairs: List, - ): List { - return map { (account, currencies) -> - AccountAvailabilityUM( - account = account, - currencyList = currencies.map { status -> - val isAvailable = availablePairs.map(SwapPairLeast::to).contains(status.toLeastTokenInfo()) - - val isAvailableToSwap = isAvailable && - status.value !is CryptoCurrencyStatus.MissedDerivation && - status.value !is CryptoCurrencyStatus.Unreachable && - !status.currency.isCustom - - AccountCurrencyUM( - cryptoCurrencyStatus = status, - isAvailable = isAvailableToSwap, - ) - }, - ) - } - } - - private fun onPortfolioTokenClick(tokenItem: TokenItemState, status: CryptoCurrencyStatus) { - analyticsEventHandler.send( - SwapAnalyticsEvent.TokenSelected( - token = status.currency.symbol, - source = ScreensSources.Portfolio, - isSearched = state.value.searchBarUM.query.isNotEmpty(), - ), - ) - clearSearchState() - params.onTokenClick(tokenItem, status) - } - - private fun clearSearchState() { - tokenListUMController.update( - transformer = ClearSearchBarTransformer( - placeHolder = resourceReference(id = R.string.common_search), - ), - ) - modelScope.launch { - searchManager.update("") - } - searchQueryStateForMarkets.value = "" - } - - private fun CryptoCurrencyStatus.toLeastTokenInfo(): LeastTokenInfo { - return LeastTokenInfo( - contractAddress = (currency as? CryptoCurrency.Token)?.contractAddress ?: "0", - network = currency.network.rawId, - ) - } - - @OptIn(ExperimentalCoroutinesApi::class) - private fun subscribeOnMarketsUpdates() { - searchQueryStateForMarkets - .map { it.isEmpty() } - .distinctUntilChanged() - .flatMapLatest { isDefaultMode -> - if (isDefaultMode) { - visibleMarketItemIds.value = emptyList() - createDefaultMarketsFlow() - } else { - visibleDefaultMarketItemIds.value = emptyList() - createSearchMarketsFlow() - } - } - .onEach { marketsState -> - tokenListUMController.update { it.copy(marketsState = marketsState) } - } - .flowOn(dispatchers.main) - .launchIn(modelScope) - - searchQueryStateForMarkets - .onEach { searchQuery -> - if (searchQuery.isNotEmpty()) { - searchMarketsListManager.reload(searchQuery) - } - } - .launchIn(modelScope) - - params.selectedStatus - .filterNotNull() - .take(1) - .onEach { defaultMarketsListManager.reload() } - .launchIn(modelScope) - } - - private fun createDefaultMarketsFlow(): Flow { - val marketsTitle = TextReference.Res(CoreUiR.string.feed_trending_now) - return combine( - defaultMarketsListManager.uiItems, - defaultMarketsListManager.isInInitialLoadingErrorState, - defaultMarketsListManager.totalCount, - ) { uiItems, isError, total -> - when { - isError -> SwapMarketState.LoadingError( - onRetryClicked = { defaultMarketsListManager.reload() }, - marketsTitle = marketsTitle, - shouldAssetsCount = false, - ) - uiItems.isEmpty() -> SwapMarketState.Loading( - marketsTitle = marketsTitle, - shouldAssetsCount = false, - ) - else -> SwapMarketState.Content( - items = uiItems, - loadMore = { defaultMarketsListManager.loadMore() }, - onItemClick = { item -> addToPortfolioItem(item) }, - visibleIdsChanged = { visibleDefaultMarketItemIds.value = it }, - total = total ?: uiItems.size, - marketsTitle = marketsTitle, - shouldAssetsCount = false, - ) - } - } - } - - private fun createSearchMarketsFlow(): Flow { - val marketsTitle = TextReference.Res(CoreUiR.string.markets_common_title) - return combine( - flow = searchMarketsListManager.uiItems, - flow2 = searchMarketsListManager.isInInitialLoadingErrorState, - flow3 = searchMarketsListManager.isSearchNotFoundState, - flow4 = searchMarketsListManager.totalCount, - ) { uiItems, isError, isSearchNotFound, total -> - when { - isError -> SwapMarketState.LoadingError( - onRetryClicked = { - searchMarketsListManager.reload(searchQueryStateForMarkets.value) - }, - marketsTitle = marketsTitle, - shouldAssetsCount = true, - ) - isSearchNotFound -> SwapMarketState.SearchNothingFound - uiItems.isEmpty() -> SwapMarketState.Loading( - marketsTitle = marketsTitle, - shouldAssetsCount = true, - ) - else -> SwapMarketState.Content( - items = uiItems, - loadMore = { searchMarketsListManager.loadMore() }, - onItemClick = { item -> addToPortfolioItem(item) }, - visibleIdsChanged = { visibleMarketItemIds.value = it }, - total = total ?: uiItems.size, - marketsTitle = marketsTitle, - shouldAssetsCount = true, - ) - } - } - } - - private fun onTokenAddedToPortfolio(addedToken: CryptoCurrency) { - modelScope.launch { - bottomSheetNavigation.dismiss() - analyticsEventHandler.send( - SwapAnalyticsEvent.TokenSelected( - token = addedToken.symbol, - source = ScreensSources.Markets, - isSearched = state.value.searchBarUM.query.isNotEmpty(), - ), - ) - - clearSearchState() - - // Trigger re-fetch of available pairs (clears cache + re-enters collectLatest) - refreshPairsTrigger.emit(Unit) - - // Wait for the added token status to become Loaded - val addedTokenStatus = getAccountCurrencyStatusUseCase(params.userWalletId, addedToken) - .firstOrNull { it.status.value is CryptoCurrencyStatus.Loaded } - ?.status - ?: return@launch - - // Convert to TokenItemState and trigger token selection → navigates to swap - val converter = OnrampTokenItemStateConverterFactory.createAvailableItemConverter( - appCurrency = selectedAppCurrencyFlow.value, - onItemClick = params.onTokenClick, - ) - params.onTokenClick(converter.convert(addedTokenStatus), addedTokenStatus) - } - } - - private fun addToPortfolioItem(item: MarketsListItemUM) { - val tokenMarket = defaultMarketsListManager.getTokenMarketById(item.id) - ?: searchMarketsListManager.getTokenMarketById(item.id) - ?: return - - val param = tokenMarket.toSerializableParam() - val hasOnlyHotWallets = allUserWallets.all { it is UserWallet.Hot } - - val networks = tokenMarket.networks?.filter { network -> - BlockchainUtils.isSupportedNetworkId( - networkId = network.networkId, - coinId = tokenMarket.id.value, - contractAddress = network.contractAddress, - excludedBlockchains = excludedBlockchains, - hotExcludedBlockchains = hotWalletExcludedBlockchains, - hasOnlyHotWallets = hasOnlyHotWallets, - ) - }?.map { network -> - TokenMarketInfo.Network( - networkId = network.networkId, - isExchangeable = false, - contractAddress = network.contractAddress, - decimalCount = network.decimalCount, - ) - }.orEmpty() - - addToPortfolioManager.setTokenNetworks(networks) - addToPortfolioManager.setTokenParams(param) - - bottomSheetNavigation.activate(AddToPortfolioRoute) - } - - private fun subscribeOnVisibleMarketItems() { - modelScope.launch { - visibleMarketItemIds.mapNotNull { rawIds -> - if (rawIds.isNotEmpty()) { - searchMarketsListManager.getBatchKeysByItemIds(rawIds) - } else { - null - } - }.distinctUntilChanged().collectLatest { visibleBatchKeys -> - searchMarketsListManager.loadCharts(visibleBatchKeys) - } - } - modelScope.launch { - visibleDefaultMarketItemIds.mapNotNull { rawIds -> - if (rawIds.isNotEmpty()) { - defaultMarketsListManager.getBatchKeysByItemIds(rawIds) - } else { - null - } - }.distinctUntilChanged().collectLatest { visibleBatchKeys -> - defaultMarketsListManager.loadCharts(visibleBatchKeys) - } - } - } -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/ui/SwapMarketsListItems.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/ui/SwapMarketsListItems.kt deleted file mode 100644 index 18600da888..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/ui/SwapMarketsListItems.kt +++ /dev/null @@ -1,114 +0,0 @@ -package com.tangem.features.onramp.swap.availablepairs.ui - -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.lazy.LazyListScope -import androidx.compose.foundation.lazy.itemsIndexed -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.text.SpanStyle -import androidx.compose.ui.text.buildAnnotatedString -import androidx.compose.ui.text.withStyle -import com.tangem.common.ui.markets.MarketsListItem -import com.tangem.common.ui.markets.MarketsListItemPlaceholder -import com.tangem.core.ui.R -import com.tangem.core.ui.components.UnableToLoadData -import com.tangem.core.ui.decorations.roundedShapeItemDecoration -import com.tangem.core.ui.extensions.resolveReference -import com.tangem.core.ui.extensions.stringResourceSafe -import com.tangem.core.ui.res.TangemTheme -import com.tangem.features.onramp.swap.availablepairs.market.state.SwapMarketState - -private const val LOADING_PLACEHOLDERS_COUNT = 20 - -internal fun LazyListScope.swapMarketsListItems(state: SwapMarketState) { - item(key = "markets_title") { - val totalCount = (state as? SwapMarketState.Content)?.total - Text( - text = buildAnnotatedString { - append(state.marketsTitle.resolveReference()) - if (totalCount != null) { - withStyle(SpanStyle(color = TangemTheme.colors.text.tertiary)) { - append(" $totalCount") - } - } - }, - style = TangemTheme.typography.h3, - color = TangemTheme.colors.text.primary1, - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = TangemTheme.dimens.spacing16) - .padding(top = TangemTheme.dimens.spacing24, bottom = TangemTheme.dimens.spacing12), - ) - } - - when (state) { - is SwapMarketState.Loading -> { - items(count = LOADING_PLACEHOLDERS_COUNT, key = { "market_placeholder_$it" }) { - MarketsListItemPlaceholder() - } - } - is SwapMarketState.LoadingError -> { - item(key = "market_loading_error") { - LoadingErrorItem( - modifier = Modifier.fillParentMaxWidth(), - onTryAgain = state.onRetryClicked, - ) - } - } - SwapMarketState.SearchNothingFound -> { - item(key = "market_not_found") { - SearchNothingFoundText( - modifier = Modifier.fillParentMaxWidth(), - ) - } - } - is SwapMarketState.Content -> { - itemsIndexed( - items = state.items, - key = { _, item -> item.getComposeKey() }, - ) { index, item -> - MarketsListItem( - model = item, - onClick = { state.onItemClick(item) }, - modifier = Modifier.roundedShapeItemDecoration( - currentIndex = index, - lastIndex = state.items.lastIndex, - backgroundColor = TangemTheme.colors.background.action, - ), - ) - } - } - } -} - -@Composable -private fun LoadingErrorItem(onTryAgain: () -> Unit, modifier: Modifier = Modifier) { - Box( - modifier - .padding( - horizontal = TangemTheme.dimens.spacing16, - vertical = TangemTheme.dimens.spacing12, - ), - contentAlignment = Alignment.Center, - ) { - UnableToLoadData(onRetryClick = onTryAgain) - } -} - -@Composable -private fun SearchNothingFoundText(modifier: Modifier = Modifier) { - Box( - modifier = modifier.padding(TangemTheme.dimens.spacing16), - contentAlignment = Alignment.Center, - ) { - Text( - text = stringResourceSafe(R.string.markets_search_token_no_result_title), - style = TangemTheme.typography.caption1, - color = TangemTheme.colors.text.tertiary, - ) - } -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/di/SwapSelectTokensComponentModule.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/di/SwapSelectTokensComponentModule.kt deleted file mode 100644 index 059c28a82a..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/di/SwapSelectTokensComponentModule.kt +++ /dev/null @@ -1,20 +0,0 @@ -package com.tangem.features.onramp.swap.di - -import com.tangem.features.onramp.component.SwapSelectTokensComponent -import com.tangem.features.onramp.swap.DefaultSwapSelectTokensComponent -import dagger.Binds -import dagger.Module -import dagger.hilt.InstallIn -import dagger.hilt.components.SingletonComponent -import javax.inject.Singleton - -@Module -@InstallIn(SingletonComponent::class) -internal interface SwapSelectTokensComponentModule { - - @Binds - @Singleton - fun bindSwapSelectTokensComponentFactory( - factory: DefaultSwapSelectTokensComponent.Factory, - ): SwapSelectTokensComponent.Factory -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/di/SwapSelectTokensModelModule.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/di/SwapSelectTokensModelModule.kt deleted file mode 100644 index 01b1201354..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/di/SwapSelectTokensModelModule.kt +++ /dev/null @@ -1,20 +0,0 @@ -package com.tangem.features.onramp.swap.di - -import com.tangem.core.decompose.di.ModelComponent -import com.tangem.core.decompose.model.Model -import com.tangem.features.onramp.swap.model.SwapSelectTokensModel -import dagger.Binds -import dagger.Module -import dagger.hilt.InstallIn -import dagger.multibindings.ClassKey -import dagger.multibindings.IntoMap - -@Module -@InstallIn(ModelComponent::class) -internal interface SwapSelectTokensModelModule { - - @Binds - @IntoMap - @ClassKey(SwapSelectTokensModel::class) - fun bindOnrampTokenListModel(model: SwapSelectTokensModel): Model -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/ExchangeCardUM.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/ExchangeCardUM.kt deleted file mode 100644 index 1d5877f437..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/ExchangeCardUM.kt +++ /dev/null @@ -1,63 +0,0 @@ -package com.tangem.features.onramp.swap.entity - -import androidx.compose.runtime.Immutable -import com.tangem.common.ui.account.AccountIconUM -import com.tangem.core.ui.components.token.state.TokenItemState -import com.tangem.core.ui.extensions.TextReference - -/** - * Exchange card UI model - * -[REDACTED_AUTHOR] - */ -internal sealed interface ExchangeCardUM { - - /** Title reference */ - val titleUM: TitleUM - - /** Remove button UI model */ - val removeButtonUM: RemoveButtonUM? - - /** - * Empty state - * - * @property titleUM title reference - * @property subtitleReference empty token subtitle reference - */ - data class Empty( - override val titleUM: TitleUM, - val subtitleReference: TextReference, - ) : ExchangeCardUM { - - override val removeButtonUM: RemoveButtonUM? = null - } - - /** - * Filled - * - * @property titleUM title reference - * @property removeButtonUM remove button UI model - * @property tokenItemState token item state - */ - data class Filled( - override val titleUM: TitleUM, - override val removeButtonUM: RemoveButtonUM?, - val tokenItemState: TokenItemState, - ) : ExchangeCardUM - - data class RemoveButtonUM(val onClick: () -> Unit) - - @Immutable - sealed interface TitleUM { - - data class Text( - val title: TextReference, - ) : TitleUM - - data class Account( - val prefixText: TextReference, - val name: TextReference, - val icon: AccountIconUM.CryptoPortfolio, - ) : TitleUM - } -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/SwapSelectTokensController.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/SwapSelectTokensController.kt deleted file mode 100644 index 8adcb4725d..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/SwapSelectTokensController.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.tangem.features.onramp.swap.entity - -import com.tangem.features.onramp.swap.entity.utils.createEmptyExchangeFrom -import com.tangem.features.onramp.swap.entity.utils.createEmptyExchangeTo -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.update -import com.tangem.utils.logging.TangemLogger -import javax.inject.Inject - -/** - * [SwapSelectTokensUM] controller - * -[REDACTED_AUTHOR] - */ -internal class SwapSelectTokensController @Inject constructor() { - - val state: StateFlow - field = MutableStateFlow( - value = SwapSelectTokensUM( - onBackClick = {}, - exchangeFrom = createEmptyExchangeFrom(), - exchangeTo = createEmptyExchangeTo(), - isBalanceHidden = false, - ), - ) - - fun update(transform: (SwapSelectTokensUM) -> SwapSelectTokensUM) { - TangemLogger.d("Applying non-name transformation") - state.update(transform) - } - - fun update(transformer: SwapSelectTokensUMTransformer) { - TangemLogger.d("Applying ${transformer::class.simpleName ?: "null"}") - state.update(transformer::transform) - } -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/SwapSelectTokensUM.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/SwapSelectTokensUM.kt deleted file mode 100644 index 1bdf9b047a..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/SwapSelectTokensUM.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.tangem.features.onramp.swap.entity - -/** - * Swap select tokens UI model - * - * @property onBackClick callback is called when back button is clicked - * @property exchangeFrom exchange "from" card UI model - * @property exchangeTo exchange "to" card UI model - * -[REDACTED_AUTHOR] - */ -internal data class SwapSelectTokensUM( - val onBackClick: () -> Unit, - val exchangeFrom: ExchangeCardUM, - val exchangeTo: ExchangeCardUM, - val isBalanceHidden: Boolean, -) \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/SwapSelectTokensUMTransformer.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/SwapSelectTokensUMTransformer.kt deleted file mode 100644 index fb2f9ca537..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/SwapSelectTokensUMTransformer.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.tangem.features.onramp.swap.entity - -import com.tangem.utils.transformer.Transformer - -/** - * Base [SwapSelectTokensUM] transformer - * -[REDACTED_AUTHOR] - */ -internal interface SwapSelectTokensUMTransformer : Transformer \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/transformer/RemoveSelectedFromTokenTransformer.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/transformer/RemoveSelectedFromTokenTransformer.kt deleted file mode 100644 index 828f9d6ad0..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/transformer/RemoveSelectedFromTokenTransformer.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.tangem.features.onramp.swap.entity.transformer - -import com.tangem.features.onramp.swap.entity.SwapSelectTokensUM -import com.tangem.features.onramp.swap.entity.SwapSelectTokensUMTransformer -import com.tangem.features.onramp.swap.entity.utils.createEmptyExchangeFrom -import com.tangem.features.onramp.swap.entity.utils.createEmptyExchangeTo - -/** - * Transformer for removing selected "from" token - * -[REDACTED_AUTHOR] - */ -internal object RemoveSelectedFromTokenTransformer : SwapSelectTokensUMTransformer { - - override fun transform(prevState: SwapSelectTokensUM): SwapSelectTokensUM { - return prevState.copy( - exchangeFrom = createEmptyExchangeFrom(), - exchangeTo = createEmptyExchangeTo(), - ) - } -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/transformer/RemoveSelectedToTokenTransformer.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/transformer/RemoveSelectedToTokenTransformer.kt deleted file mode 100644 index 971bf36fd8..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/transformer/RemoveSelectedToTokenTransformer.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.tangem.features.onramp.swap.entity.transformer - -import com.tangem.features.onramp.swap.entity.ExchangeCardUM -import com.tangem.features.onramp.swap.entity.SwapSelectTokensUM -import com.tangem.features.onramp.swap.entity.SwapSelectTokensUMTransformer -import com.tangem.features.onramp.swap.entity.utils.createEmptyExchangeTo - -/** - * Transformer for removing selected "to" token - * -[REDACTED_AUTHOR] - */ -internal class RemoveSelectedToTokenTransformer( - private val onRemoveFromTokenClick: () -> Unit, -) : SwapSelectTokensUMTransformer { - - override fun transform(prevState: SwapSelectTokensUM): SwapSelectTokensUM { - return prevState.copy( - exchangeFrom = prevState.exchangeFrom.showRemoveButton(onClick = onRemoveFromTokenClick), - exchangeTo = createEmptyExchangeTo(), - ) - } - - private fun ExchangeCardUM.showRemoveButton(onClick: () -> Unit): ExchangeCardUM { - return (this as? ExchangeCardUM.Filled) - ?.copy(removeButtonUM = ExchangeCardUM.RemoveButtonUM(onClick = onClick)) - ?: this - } -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/transformer/SelectFromTokenTransformer.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/transformer/SelectFromTokenTransformer.kt deleted file mode 100644 index 3ca1f8776b..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/transformer/SelectFromTokenTransformer.kt +++ /dev/null @@ -1,36 +0,0 @@ -package com.tangem.features.onramp.swap.entity.transformer - -import com.tangem.core.ui.components.token.state.TokenItemState -import com.tangem.domain.models.account.Account -import com.tangem.features.onramp.swap.entity.ExchangeCardUM -import com.tangem.features.onramp.swap.entity.SwapSelectTokensUM -import com.tangem.features.onramp.swap.entity.SwapSelectTokensUMTransformer -import com.tangem.features.onramp.swap.entity.utils.toFilled - -/** - * Transformer for selecting "from" token - * - * @property selectedTokenItemState token item state - * @property onRemoveClick callback is called when remove button is clicked - * -[REDACTED_AUTHOR] - */ -internal class SelectFromTokenTransformer( - private val selectedTokenItemState: TokenItemState, - private val onRemoveClick: () -> Unit, - private val account: Account.CryptoPortfolio?, - private val isAccountsMode: Boolean, -) : SwapSelectTokensUMTransformer { - - override fun transform(prevState: SwapSelectTokensUM): SwapSelectTokensUM { - return prevState.copy( - exchangeFrom = prevState.exchangeFrom.toFilled( - selectedTokenItemState = selectedTokenItemState, - removeButtonUM = ExchangeCardUM.RemoveButtonUM(onClick = onRemoveClick), - account = account, - isAccountsMode = isAccountsMode, - isFromCurrency = true, - ), - ) - } -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/transformer/SelectToTokenTransformer.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/transformer/SelectToTokenTransformer.kt deleted file mode 100644 index 8699cd9e56..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/transformer/SelectToTokenTransformer.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.tangem.features.onramp.swap.entity.transformer - -import com.tangem.core.ui.components.token.state.TokenItemState -import com.tangem.domain.models.account.Account -import com.tangem.features.onramp.swap.entity.ExchangeCardUM -import com.tangem.features.onramp.swap.entity.SwapSelectTokensUM -import com.tangem.features.onramp.swap.entity.SwapSelectTokensUMTransformer -import com.tangem.features.onramp.swap.entity.utils.toFilled - -/** - * Transformer for selecting "to" token - * - * @property selectedTokenItemState token item state - * -[REDACTED_AUTHOR] - */ -internal class SelectToTokenTransformer( - private val selectedTokenItemState: TokenItemState, - private val isAccountsMode: Boolean, - private val account: Account.CryptoPortfolio?, -) : SwapSelectTokensUMTransformer { - - override fun transform(prevState: SwapSelectTokensUM): SwapSelectTokensUM { - return prevState.copy( - exchangeFrom = prevState.exchangeFrom.hideRemoveButton(), - exchangeTo = prevState.exchangeTo.toFilled( - selectedTokenItemState = selectedTokenItemState, - isAccountsMode = isAccountsMode, - account = account, - isFromCurrency = false, - ), - ) - } - - private fun ExchangeCardUM.hideRemoveButton(): ExchangeCardUM { - return (this as? ExchangeCardUM.Filled)?.copy(removeButtonUM = null) ?: this - } -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/utils/ExchangeCardUMExt.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/utils/ExchangeCardUMExt.kt deleted file mode 100644 index 892b627a0c..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/utils/ExchangeCardUMExt.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.tangem.features.onramp.swap.entity.utils - -import com.tangem.common.ui.account.CryptoPortfolioIconConverter -import com.tangem.common.ui.account.toUM -import com.tangem.core.ui.components.token.state.TokenItemState -import com.tangem.core.ui.extensions.resourceReference -import com.tangem.domain.models.account.Account -import com.tangem.features.onramp.impl.R -import com.tangem.features.onramp.swap.entity.ExchangeCardUM - -/** Create empty exchange "from" card */ -internal fun createEmptyExchangeFrom(): ExchangeCardUM.Empty { - return ExchangeCardUM.Empty( - titleUM = ExchangeCardUM.TitleUM.Text(resourceReference(id = R.string.swapping_from_title)), - subtitleReference = resourceReference(id = R.string.action_buttons_you_want_to_swap), - ) -} - -/** Create empty exchange "to" card */ -internal fun createEmptyExchangeTo(): ExchangeCardUM.Empty { - return ExchangeCardUM.Empty( - titleUM = ExchangeCardUM.TitleUM.Text(resourceReference(id = R.string.swapping_to_title)), - subtitleReference = resourceReference(id = R.string.action_buttons_you_want_to_receive), - ) -} - -/** - * Convert from [ExchangeCardUM] to [ExchangeCardUM.Filled] - * - * @param selectedTokenItemState token item state - * @param removeButtonUM remove button UI model - */ -internal fun ExchangeCardUM.toFilled( - selectedTokenItemState: TokenItemState, - account: Account.CryptoPortfolio?, - isAccountsMode: Boolean, - isFromCurrency: Boolean, - removeButtonUM: ExchangeCardUM.RemoveButtonUM? = null, -): ExchangeCardUM.Filled { - return ExchangeCardUM.Filled( - titleUM = if (account != null && isAccountsMode) { - ExchangeCardUM.TitleUM.Account( - prefixText = if (isFromCurrency) { - resourceReference(R.string.common_from) - } else { - resourceReference(R.string.common_to) - }, - name = account.accountName.toUM().value, - icon = CryptoPortfolioIconConverter.convert(account.icon), - ) - } else { - titleUM - }, - tokenItemState = selectedTokenItemState, - removeButtonUM = removeButtonUM, - ) -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/model/SwapSelectTokensModel.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/model/SwapSelectTokensModel.kt deleted file mode 100644 index 697f08be5a..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/model/SwapSelectTokensModel.kt +++ /dev/null @@ -1,187 +0,0 @@ -package com.tangem.features.onramp.swap.model - -import com.tangem.common.routing.AppRoute -import com.tangem.core.analytics.api.AnalyticsEventHandler -import com.tangem.core.analytics.models.AnalyticsParam -import com.tangem.core.analytics.models.event.MainScreenAnalyticsEvent -import com.tangem.core.decompose.model.Model -import com.tangem.core.decompose.model.ParamsContainer -import com.tangem.core.decompose.navigation.Router -import com.tangem.core.ui.components.token.state.TokenItemState -import com.tangem.domain.account.status.usecase.GetAccountCurrencyStatusUseCase -import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase -import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase -import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.onramp.component.SwapSelectTokensComponent -import com.tangem.features.onramp.swap.entity.SwapSelectTokensController -import com.tangem.features.onramp.swap.entity.SwapSelectTokensUM -import com.tangem.features.onramp.swap.entity.transformer.RemoveSelectedFromTokenTransformer -import com.tangem.features.onramp.swap.entity.transformer.RemoveSelectedToTokenTransformer -import com.tangem.features.onramp.swap.entity.transformer.SelectFromTokenTransformer -import com.tangem.features.onramp.swap.entity.transformer.SelectToTokenTransformer -import com.tangem.utils.coroutines.CoroutineDispatcherProvider -import kotlinx.coroutines.delay -import kotlinx.coroutines.flow.* -import kotlinx.coroutines.launch -import kotlinx.coroutines.withTimeout -import javax.inject.Inject - -@Suppress("LongParameterList") -internal class SwapSelectTokensModel @Inject constructor( - paramsContainer: ParamsContainer, - override val dispatchers: CoroutineDispatcherProvider, - private val controller: SwapSelectTokensController, - private val router: Router, - private val analyticsEventHandler: AnalyticsEventHandler, - private val getBalanceHidingSettingsUseCase: GetBalanceHidingSettingsUseCase, - private val isAccountsModeEnabledUseCase: IsAccountsModeEnabledUseCase, - private val getAccountCurrencyStatusUseCase: GetAccountCurrencyStatusUseCase, -) : Model() { - - val state: StateFlow = controller.state - - val fromCurrencyStatus: StateFlow - field = MutableStateFlow(value = null) - - private val _toCurrencyStatus = MutableStateFlow(value = null) - - private val params = paramsContainer.require() - - private var isAccountsMode: Boolean = false - - init { - controller.update { it.copy(onBackClick = ::onBackClick) } - - subscribeOnAccountsMode() - subscribeOnBalanceHidingSettings() - } - - /** - * Select "from" token - * - * @param selectedTokenItemState selected token item state - * @param status crypto currency status - */ - fun selectFromToken(selectedTokenItemState: TokenItemState, status: CryptoCurrencyStatus) { - analyticsEventHandler.send( - event = MainScreenAnalyticsEvent.SwapTokenClicked(currencySymbol = status.currency.symbol), - ) - - fromCurrencyStatus.value = status - - modelScope.launch { - controller.update( - transformer = SelectFromTokenTransformer( - selectedTokenItemState = selectedTokenItemState, - onRemoveClick = ::onRemoveFromTokenClick, - isAccountsMode = isAccountsMode, - account = getAccountCurrencyStatusUseCase.invokeSync( - userWalletId = params.userWalletId, - currency = status.currency, - ).getOrNull()?.account, - ), - ) - } - } - - /** - * Select "to" token - * - * @param selectedTokenItemState selected token item state - * @param status crypto currency status - */ - fun selectToToken(selectedTokenItemState: TokenItemState, status: CryptoCurrencyStatus) { - analyticsEventHandler.send( - event = MainScreenAnalyticsEvent.ReceiveTokenClicked(currencySymbol = status.currency.symbol), - ) - - modelScope.launch { - _toCurrencyStatus.value = status - - controller.update( - transformer = SelectToTokenTransformer( - selectedTokenItemState = selectedTokenItemState, - isAccountsMode = isAccountsMode, - account = getAccountCurrencyStatusUseCase.invokeSync( - userWalletId = params.userWalletId, - currency = status.currency, - ).getOrNull()?.account, - ), - ) - - // require some delay to show state with selected "from" and "to" tokens - delay(timeMillis = 500) - - router.push( - route = AppRoute.Swap( - fromCryptoCurrency = requireNotNull(fromCurrencyStatus.value).currency, - userWalletId = params.userWalletId, - screenSource = AnalyticsParam.ScreensSources.Main.value, - ), - onComplete = { - modelScope.launch { - withTimeout(timeMillis = 500) { - // Return a state with selected only "from" token - removeSelectedToToken() - } - } - }, - ) - } - } - - private fun subscribeOnBalanceHidingSettings() { - getBalanceHidingSettingsUseCase() - .map { it.isBalanceHidden } - .distinctUntilChanged() - .onEach { - controller.update { state -> state.copy(isBalanceHidden = it) } - } - .flowOn(dispatchers.mainImmediate) - .launchIn(modelScope) - } - - private fun subscribeOnAccountsMode() { - isAccountsModeEnabledUseCase() - .distinctUntilChanged() - .onEach { - isAccountsMode = it - } - .flowOn(dispatchers.default) - .launchIn(modelScope) - } - - private fun onBackClick() { - analyticsEventHandler.send( - event = MainScreenAnalyticsEvent.ButtonClose(source = AnalyticsParam.ScreensSources.Swap), - ) - - router.pop() - } - - private fun onRemoveFromTokenClick() { - val currencySymbol = requireNotNull(fromCurrencyStatus.value?.currency?.symbol) { - "Token was not selected" - } - - analyticsEventHandler.send( - event = MainScreenAnalyticsEvent.RemoveTokenClicked(currencySymbol = currencySymbol), - ) - - removeSelectedFromToken() - } - - private fun removeSelectedFromToken() { - fromCurrencyStatus.value = null - - controller.update(transformer = RemoveSelectedFromTokenTransformer) - } - - private fun removeSelectedToToken() { - _toCurrencyStatus.value = null - - controller.update( - transformer = RemoveSelectedToTokenTransformer(onRemoveFromTokenClick = ::removeSelectedFromToken), - ) - } -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/ui/ExchangeCard.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/ui/ExchangeCard.kt deleted file mode 100644 index da564d9d1b..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/ui/ExchangeCard.kt +++ /dev/null @@ -1,214 +0,0 @@ -package com.tangem.features.onramp.swap.ui - -import android.content.res.Configuration -import androidx.compose.animation.* -import androidx.compose.animation.core.tween -import androidx.compose.foundation.background -import androidx.compose.foundation.clickable -import androidx.compose.foundation.interaction.MutableInteractionSource -import androidx.compose.foundation.layout.* -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.Text -import androidx.compose.material3.ripple -import androidx.compose.runtime.Composable -import androidx.compose.runtime.remember -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip -import androidx.compose.ui.platform.testTag -import androidx.compose.ui.text.style.TextOverflow -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.tooling.preview.PreviewParameter -import androidx.compose.ui.tooling.preview.PreviewParameterProvider -import androidx.compose.ui.unit.dp -import com.tangem.common.ui.account.AccountLabel -import com.tangem.core.ui.components.account.AccountIconSize -import com.tangem.core.ui.components.currency.icon.CurrencyIconState -import com.tangem.core.ui.components.marketprice.PriceChangeType -import com.tangem.core.ui.components.rows.NetworkTitle -import com.tangem.core.ui.components.token.TokenItem -import com.tangem.core.ui.components.token.state.TokenItemState -import com.tangem.core.ui.extensions.* -import com.tangem.core.ui.res.TangemTheme -import com.tangem.core.ui.res.TangemThemePreview -import com.tangem.core.ui.test.SwapSelectTokenScreenTestTags -import com.tangem.core.ui.utils.dashedBorder -import com.tangem.features.onramp.impl.R -import com.tangem.features.onramp.swap.entity.ExchangeCardUM - -/** - * Exchange card - * - * @param state state - * @param isBalanceHidden is balance hidden - * @param modifier modifier - * -[REDACTED_AUTHOR] - */ -@Composable -internal fun ExchangeCard(state: ExchangeCardUM, isBalanceHidden: Boolean, modifier: Modifier = Modifier) { - Column( - modifier = modifier - .fillMaxWidth() - .heightIn(min = 116.dp) - .clip(TangemTheme.shapes.roundedCornersXMedium) - .background(TangemTheme.colors.background.primary) - .testTag(SwapSelectTokenScreenTestTags.YOU_SWAP_BLOCK), - verticalArrangement = Arrangement.SpaceBetween, - ) { - Title( - titleUM = state.titleUM, - removeButtonUM = state.removeButtonUM, - ) - - AnimatedContent( - targetState = state, - transitionSpec = { - fadeIn(animationSpec = tween(durationMillis = 220, delayMillis = 90)) - .togetherWith(fadeOut(animationSpec = tween(durationMillis = 90))) - }, - label = "TokenItem's changing", - ) { animatedState -> - when (animatedState) { - is ExchangeCardUM.Empty -> EmptyTokenBlock(text = animatedState.subtitleReference) - is ExchangeCardUM.Filled -> { - TokenItem(state = animatedState.tokenItemState, isBalanceHidden = isBalanceHidden) - } - } - } - } -} - -@Composable -private fun Title(titleUM: ExchangeCardUM.TitleUM, removeButtonUM: ExchangeCardUM.RemoveButtonUM?) { - NetworkTitle( - title = { - AnimatedContent( - titleUM, - ) { currentState -> - when (currentState) { - is ExchangeCardUM.TitleUM.Account -> Row( - horizontalArrangement = Arrangement.spacedBy(6.dp), - verticalAlignment = Alignment.CenterVertically, - ) { - Text( - text = currentState.prefixText.resolveReference(), - style = TangemTheme.typography.subtitle2, - color = TangemTheme.colors.text.tertiary, - ) - AccountLabel( - name = currentState.name, - icon = currentState.icon, - iconSize = AccountIconSize.ExtraSmall, - nameStyle = TangemTheme.typography.subtitle2, - nameColor = TangemTheme.colors.text.tertiary, - ) - } - is ExchangeCardUM.TitleUM.Text -> Text( - text = currentState.title.resolveReference(), - color = TangemTheme.colors.text.tertiary, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - style = TangemTheme.typography.subtitle2, - ) - } - } - }, - action = { RemoveButton(state = removeButtonUM) }, - ) -} - -@Composable -private fun RemoveButton(state: ExchangeCardUM.RemoveButtonUM?) { - AnimatedVisibility(visible = state != null) { - state ?: return@AnimatedVisibility - - Text( - text = stringResourceSafe(id = R.string.manage_tokens_remove), - modifier = Modifier.clickable( - indication = ripple(bounded = false), - interactionSource = remember { MutableInteractionSource() }, - onClick = state.onClick, - ), - color = TangemTheme.colors.text.accent, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - style = TangemTheme.typography.body2, - ) - } -} - -@Composable -private fun EmptyTokenBlock(text: TextReference, modifier: Modifier = Modifier) { - Box( - modifier = modifier - .padding(horizontal = 12.dp, vertical = 13.dp) - .heightIn(min = 50.dp) - .fillMaxWidth() - .dashedBorder( - color = TangemTheme.colors.icon.informative, - shape = RoundedCornerShape(16.dp), - dashLength = 2.dp, - gapLength = 6.dp, - ) - .padding(vertical = 15.dp), - contentAlignment = Alignment.Center, - ) { - Text( - text = text.resolveReference(), - color = TangemTheme.colors.text.tertiary, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - style = TangemTheme.typography.body2, - modifier = Modifier.testTag(SwapSelectTokenScreenTestTags.CHOOSE_TOKEN_TEXT), - ) - } -} - -@Preview(showBackground = true, widthDp = 360) -@Preview(showBackground = true, widthDp = 360, uiMode = Configuration.UI_MODE_NIGHT_YES) -@Composable -private fun Preview_ExchangeCard(@PreviewParameter(ExchangeCardUMProvider::class) state: ExchangeCardUM) { - TangemThemePreview { - ExchangeCard( - state = state, - isBalanceHidden = false, - modifier = Modifier - .background(TangemTheme.colors.background.secondary) - .padding(16.dp), - ) - } -} - -private class ExchangeCardUMProvider : PreviewParameterProvider { - - override val values: Sequence = sequenceOf( - ExchangeCardUM.Empty( - titleUM = ExchangeCardUM.TitleUM.Text(resourceReference(id = R.string.swapping_from_title)), - subtitleReference = resourceReference(id = R.string.action_buttons_you_want_to_swap), - ), - createFilled(removeButtonUM = null), - createFilled(removeButtonUM = ExchangeCardUM.RemoveButtonUM { }), - ) - - private fun createFilled(removeButtonUM: ExchangeCardUM.RemoveButtonUM?): ExchangeCardUM.Filled { - return ExchangeCardUM.Filled( - titleUM = ExchangeCardUM.TitleUM.Text(resourceReference(id = R.string.swapping_from_title)), - removeButtonUM = removeButtonUM, - tokenItemState = TokenItemState.Content( - id = "1", - iconState = CurrencyIconState.Locked, - titleState = TokenItemState.TitleState.Content(text = stringReference(value = "Bitcoin")), - fiatAmountState = TokenItemState.FiatAmountState.Content(text = "12 368,14 \$"), - subtitle2State = TokenItemState.Subtitle2State.TextContent(text = "0,35853044 BTC"), - subtitleState = TokenItemState.SubtitleState.CryptoPriceContent( - price = "34 496,75 \$", - priceChangePercent = "0,43 %", - type = PriceChangeType.DOWN, - ), - onItemClick = {}, - onItemLongClick = {}, - ), - ) - } -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/ui/SwapSelectTokens.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/ui/SwapSelectTokens.kt deleted file mode 100644 index 5d3e457cc8..0000000000 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/ui/SwapSelectTokens.kt +++ /dev/null @@ -1,214 +0,0 @@ -package com.tangem.features.onramp.swap.ui - -import androidx.activity.compose.BackHandler -import androidx.compose.foundation.ExperimentalFoundationApi -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.PaddingValues -import androidx.compose.foundation.layout.imePadding -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.systemBarsPadding -import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.foundation.lazy.LazyListScope -import androidx.compose.foundation.lazy.LazyListState -import androidx.compose.foundation.lazy.rememberLazyListState -import androidx.compose.runtime.Composable -import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.derivedStateOf -import androidx.compose.runtime.getValue -import androidx.compose.runtime.remember -import androidx.compose.ui.Modifier -import androidx.compose.ui.input.nestedscroll.nestedScroll -import androidx.compose.ui.unit.dp -import com.tangem.common.ui.notifications.NotificationUM -import com.tangem.core.ui.components.appbar.AppBarWithBackButton -import com.tangem.core.ui.components.list.InfiniteListHandler -import com.tangem.core.ui.extensions.stringResourceSafe -import com.tangem.core.ui.res.TangemTheme -import com.tangem.core.ui.utils.rememberHideKeyboardNestedScrollConnection -import com.tangem.features.onramp.impl.R -import com.tangem.features.onramp.swap.availablepairs.AvailableSwapPairsComponent -import com.tangem.features.onramp.swap.availablepairs.market.state.SwapMarketState -import com.tangem.features.onramp.swap.entity.ExchangeCardUM -import com.tangem.features.onramp.swap.entity.SwapSelectTokensUM -import com.tangem.features.onramp.tokenlist.OnrampTokenListComponent -import com.tangem.features.onramp.tokenlist.entity.TokenListUM - -private const val LOAD_MORE_BUFFER = 25 - -/** - * Swap select tokens - * - * @param state state - * @param selectFromTokenListComponent select "from" token list component - * @param selectToTokenListComponent select "to" token list component - * @param modifier modifier - * -[REDACTED_AUTHOR] - */ -@OptIn(ExperimentalFoundationApi::class) -@Composable -internal fun SwapSelectTokens( - state: SwapSelectTokensUM, - selectFromTokenListComponent: OnrampTokenListComponent, - selectFromTokenListState: TokenListUM, - selectToTokenListComponent: AvailableSwapPairsComponent, - selectToTokenListState: TokenListUM, - modifier: Modifier = Modifier, -) { - BackHandler(onBack = state.onBackClick) - - val nestedScrollConnection = rememberHideKeyboardNestedScrollConnection() - val lazyListState = rememberLazyListState() - - LazyColumn( - modifier = modifier - .nestedScroll(nestedScrollConnection) - .background(TangemTheme.colors.background.secondary) - .imePadding() - .systemBarsPadding(), - state = lazyListState, - contentPadding = PaddingValues(bottom = 8.dp), - ) { - swapSelectTokensContent( - state = state, - selectFromTokenListComponent = selectFromTokenListComponent, - selectFromTokenListState = selectFromTokenListState, - selectToTokenListComponent = selectToTokenListComponent, - selectToTokenListState = selectToTokenListState, - ) - } - - ScrollToTopEffect(state = state, lazyListState = lazyListState) - - MarketsHandlers( - state = state, - selectToTokenListState = selectToTokenListState, - lazyListState = lazyListState, - ) -} - -@OptIn(ExperimentalFoundationApi::class) -private fun LazyListScope.swapSelectTokensContent( - state: SwapSelectTokensUM, - selectFromTokenListComponent: OnrampTokenListComponent, - selectFromTokenListState: TokenListUM, - selectToTokenListComponent: AvailableSwapPairsComponent, - selectToTokenListState: TokenListUM, -) { - stickyHeader(key = "header") { - AppBarWithBackButton( - onBackClick = state.onBackClick, - text = stringResourceSafe(id = R.string.common_swap), - iconRes = R.drawable.ic_close_24, - containerColor = TangemTheme.colors.background.secondary, - ) - } - - item(key = "exchange_from", contentType = "exchange_from") { - ExchangeCard( - state = state.exchangeFrom, - isBalanceHidden = state.isBalanceHidden, - modifier = Modifier - .padding(horizontal = 16.dp) - .padding(top = 8.dp, bottom = 12.dp) - .animateItem(), - ) - } - - if (state.exchangeFrom is ExchangeCardUM.Empty) { - with(selectFromTokenListComponent) { - content(uiState = selectFromTokenListState, modifier = Modifier) - } - } - - if (state.exchangeFrom is ExchangeCardUM.Filled) { - exchangeToSection( - state = state, - selectToTokenListComponent = selectToTokenListComponent, - selectToTokenListState = selectToTokenListState, - ) - } -} - -@OptIn(ExperimentalFoundationApi::class) -private fun LazyListScope.exchangeToSection( - state: SwapSelectTokensUM, - selectToTokenListComponent: AvailableSwapPairsComponent, - selectToTokenListState: TokenListUM, -) { - item(key = "exchange_to", contentType = "exchange_to") { - if (selectToTokenListState.warning != NotificationUM.Warning.SwapNoAvailablePair) { - ExchangeCard( - state = state.exchangeTo, - isBalanceHidden = state.isBalanceHidden, - modifier = Modifier - .padding(horizontal = 16.dp) - .padding(bottom = 12.dp) - .animateItem(), - ) - } - } - - if (state.exchangeTo is ExchangeCardUM.Empty) { - with(selectToTokenListComponent) { - content(uiState = selectToTokenListState, modifier = Modifier.padding(horizontal = 16.dp)) - } - } -} - -@Composable -private fun ScrollToTopEffect(state: SwapSelectTokensUM, lazyListState: LazyListState) { - LaunchedEffect(state.exchangeFrom !is ExchangeCardUM.Empty) { - lazyListState.scrollToItem(index = 0) - } -} - -@Composable -private fun MarketsHandlers( - state: SwapSelectTokensUM, - selectToTokenListState: TokenListUM, - lazyListState: LazyListState, -) { - // Markets for "to" token list - if (state.exchangeFrom is ExchangeCardUM.Filled && state.exchangeTo is ExchangeCardUM.Empty) { - MarketsPaginationHandler( - marketsState = selectToTokenListState.marketsState, - lazyListState = lazyListState, - ) - } -} - -@Composable -private fun MarketsPaginationHandler(marketsState: SwapMarketState?, lazyListState: LazyListState) { - (marketsState as? SwapMarketState.Content)?.let { content -> - VisibleItemsTracker(lazyListState = lazyListState, marketState = content) - - InfiniteListHandler( - listState = lazyListState, - buffer = LOAD_MORE_BUFFER, - triggerLoadMoreCheckOnItemsCountChange = true, - onLoadMore = remember(content) { - { - content.loadMore() - true - } - }, - ) - } -} - -@Composable -private fun VisibleItemsTracker(lazyListState: LazyListState, marketState: SwapMarketState.Content) { - val visibleItems by remember { - derivedStateOf { - lazyListState.layoutInfo.visibleItemsInfo - .mapNotNull { itemInfo -> - marketState.items.find { it.getComposeKey() == itemInfo.key }?.id - } - } - } - - LaunchedEffect(visibleItems) { - marketState.visibleIdsChanged(visibleItems) - } -} \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/AccountAvailabilityTokenUM.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/AccountAvailabilityTokenUM.kt similarity index 87% rename from features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/AccountAvailabilityTokenUM.kt rename to features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/AccountAvailabilityTokenUM.kt index f0856222ba..daae2aff89 100644 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/entity/AccountAvailabilityTokenUM.kt +++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/AccountAvailabilityTokenUM.kt @@ -1,4 +1,4 @@ -package com.tangem.features.onramp.swap.entity +package com.tangem.features.onramp.tokenlist.entity import com.tangem.domain.models.account.Account import com.tangem.domain.models.currency.CryptoCurrencyStatus diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/TokenListUM.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/TokenListUM.kt index 04f7008ff8..84c6ab33bf 100644 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/TokenListUM.kt +++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/TokenListUM.kt @@ -3,7 +3,6 @@ package com.tangem.features.onramp.tokenlist.entity import com.tangem.common.ui.notifications.NotificationUM import com.tangem.core.ui.components.fields.entity.SearchBarUM import com.tangem.core.ui.components.tokenlist.state.TokensListItemUM -import com.tangem.features.onramp.swap.availablepairs.market.state.SwapMarketState import kotlinx.collections.immutable.ImmutableList /** @@ -13,7 +12,6 @@ import kotlinx.collections.immutable.ImmutableList * @property availableItems available items (search bar, header, tokens) * @property unavailableItems unavailable items (header, tokens) * @property isBalanceHidden flag that indicates if balance should be hidden - * @property marketsState markets list state (null when markets should not be shown) * [REDACTED_AUTHOR] */ @@ -24,7 +22,6 @@ internal data class TokenListUM( val tokensListData: TokenListUMData, val isBalanceHidden: Boolean, val warning: NotificationUM? = null, - val marketsState: SwapMarketState? = null, ) internal sealed interface TokenListUMData { diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/entity/converters/LoadingAccountTokenItemConverter.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/transformer/LoadingAccountTokenItemConverter.kt similarity index 94% rename from features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/entity/converters/LoadingAccountTokenItemConverter.kt rename to features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/transformer/LoadingAccountTokenItemConverter.kt index 61552e4822..33c0f75113 100644 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/entity/converters/LoadingAccountTokenItemConverter.kt +++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/transformer/LoadingAccountTokenItemConverter.kt @@ -1,4 +1,4 @@ -package com.tangem.features.onramp.swap.availablepairs.entity.converters +package com.tangem.features.onramp.tokenlist.entity.transformer import com.tangem.common.ui.account.AccountCryptoPortfolioItemStateConverter import com.tangem.common.ui.account.TokensListPortfolioItemConverter diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/entity/converters/LoadingTokenListItemConverter.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/transformer/LoadingTokenListItemConverter.kt similarity index 93% rename from features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/entity/converters/LoadingTokenListItemConverter.kt rename to features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/transformer/LoadingTokenListItemConverter.kt index 68932d0f66..73d4dcde43 100644 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/entity/converters/LoadingTokenListItemConverter.kt +++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/transformer/LoadingTokenListItemConverter.kt @@ -1,4 +1,4 @@ -package com.tangem.features.onramp.swap.availablepairs.entity.converters +package com.tangem.features.onramp.tokenlist.entity.transformer import com.tangem.core.ui.components.currency.icon.CurrencyIconState import com.tangem.core.ui.components.token.state.TokenItemState diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/transformer/SetLoadingAccountTokenListTransformer.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/transformer/SetLoadingAccountTokenListTransformer.kt index 797dfec9df..70751009af 100644 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/transformer/SetLoadingAccountTokenListTransformer.kt +++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/transformer/SetLoadingAccountTokenListTransformer.kt @@ -4,8 +4,6 @@ import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.account.AccountStatus import com.tangem.domain.models.account.filterCryptoPortfolio import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.onramp.swap.availablepairs.entity.converters.LoadingAccountTokenItemConverter -import com.tangem.features.onramp.swap.availablepairs.entity.converters.LoadingTokenListItemConverter import com.tangem.features.onramp.tokenlist.entity.TokenListUM import com.tangem.features.onramp.tokenlist.entity.TokenListUMData import com.tangem.features.onramp.tokenlist.entity.TokenListUMTransformer diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/transformer/UpdateAccountTokenItemConverter.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/transformer/UpdateAccountTokenItemConverter.kt index 791645af20..39afe4e4e1 100644 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/transformer/UpdateAccountTokenItemConverter.kt +++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/transformer/UpdateAccountTokenItemConverter.kt @@ -8,7 +8,7 @@ import com.tangem.core.ui.extensions.TextReference import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.TotalFiatBalance import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.onramp.swap.entity.AccountAvailabilityUM +import com.tangem.features.onramp.tokenlist.entity.AccountAvailabilityUM import com.tangem.features.onramp.tokenlist.entity.utils.OnrampTokenItemStateConverterFactory import com.tangem.utils.converter.Converter import kotlinx.collections.immutable.toPersistentList diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/transformer/UpdateAccountTokenListTransformer.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/transformer/UpdateAccountTokenListTransformer.kt index 8ccc9dabe0..81a9163b2e 100644 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/transformer/UpdateAccountTokenListTransformer.kt +++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/transformer/UpdateAccountTokenListTransformer.kt @@ -8,7 +8,7 @@ import com.tangem.core.ui.extensions.resourceReference import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus import com.tangem.features.onramp.impl.R -import com.tangem.features.onramp.swap.entity.AccountAvailabilityUM +import com.tangem.features.onramp.tokenlist.entity.AccountAvailabilityUM import com.tangem.features.onramp.tokenlist.entity.TokenListUM import com.tangem.features.onramp.tokenlist.entity.TokenListUMData import com.tangem.features.onramp.tokenlist.entity.TokenListUMTransformer diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/model/OnrampTokenListModel.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/model/OnrampTokenListModel.kt index b11f85dce7..500c36d02c 100644 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/model/OnrampTokenListModel.kt +++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/model/OnrampTokenListModel.kt @@ -26,8 +26,8 @@ import com.tangem.domain.tokens.GetAssetRequirementsUseCase import com.tangem.domain.tokens.model.ScenarioUnavailabilityReason import com.tangem.domain.wallets.usecase.GetWalletsUseCase import com.tangem.features.onramp.impl.R -import com.tangem.features.onramp.swap.entity.AccountAvailabilityUM -import com.tangem.features.onramp.swap.entity.AccountCurrencyUM +import com.tangem.features.onramp.tokenlist.entity.AccountAvailabilityUM +import com.tangem.features.onramp.tokenlist.entity.AccountCurrencyUM import com.tangem.features.onramp.tokenlist.OnrampTokenListComponent import com.tangem.features.onramp.tokenlist.entity.* import com.tangem.features.onramp.tokenlist.entity.transformer.SetLoadingAccountTokenListTransformer diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/ui/OnrampTokenList.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/ui/OnrampTokenList.kt index e878df7dbd..bf5bb5fc6a 100644 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/ui/OnrampTokenList.kt +++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/ui/OnrampTokenList.kt @@ -3,25 +3,18 @@ package com.tangem.features.onramp.tokenlist.ui import android.content.res.Configuration import androidx.compose.animation.AnimatedContent import androidx.compose.foundation.background -import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.itemsIndexed -import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.platform.testTag import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.text.SpanStyle -import androidx.compose.ui.text.buildAnnotatedString -import androidx.compose.ui.text.withStyle import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp import com.tangem.common.ui.notifications.NotificationUM -import com.tangem.core.ui.R -import com.tangem.core.ui.components.SpacerH32 import com.tangem.core.ui.components.fields.SearchBar import com.tangem.core.ui.components.fields.TangemSearchBarDefaults import com.tangem.core.ui.components.fields.entity.SearchBarUM @@ -32,31 +25,15 @@ import com.tangem.core.ui.components.tokenlist.TokenListItem import com.tangem.core.ui.components.tokenlist.state.TokensListItemUM import com.tangem.core.ui.decorations.roundedShapeItemDecoration import com.tangem.core.ui.extensions.conditional -import com.tangem.core.ui.extensions.stringResourceSafe import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreview import com.tangem.core.ui.test.BuyTokenScreenTestTags import com.tangem.core.ui.utils.lazyListItemPosition -import com.tangem.features.onramp.swap.availablepairs.ui.swapMarketsListItems import com.tangem.features.onramp.tokenlist.entity.TokenListUM import com.tangem.features.onramp.tokenlist.entity.TokenListUMData import com.tangem.features.onramp.tokenlist.ui.preview.PreviewTokenListUMProvider import kotlinx.collections.immutable.ImmutableList -/** - * Token list for swap - automatically switches between normal and search mode with markets - * - * @param state state - * - */ -internal fun LazyListScope.onrampSwapTokenList(state: TokenListUM) { - if (state.marketsState != null) { - onrampTokenListWithMarkets(state = state) - } else { - onrampTokenList(state = state) - } -} - /** * Token list - normal mode (without markets) * @@ -74,39 +51,6 @@ internal fun LazyListScope.onrampTokenList(state: TokenListUM) { tokensListData(state = state) } -/** - * Token list with markets - search mode - * - * @param state state - */ -private fun LazyListScope.onrampTokenListWithMarkets(state: TokenListUM) { - val itemModifier = Modifier.padding(horizontal = 16.dp) - - warningOrSearchBar(state = state, itemModifier = itemModifier) - - // Check if user has any assets to show - val hasAssets = state.availableItems.isNotEmpty() || - state.unavailableItems.isNotEmpty() || - state.tokensListData.totalTokensCount != 0 - - if (hasAssets) { - assetsTitle( - count = state.tokensListData.totalTokensCount, - showCount = state.marketsState?.shouldAssetsCount == true, - ) - - tokensList(items = state.availableItems, isBalanceHidden = state.isBalanceHidden) - - tokensList(items = state.unavailableItems, isBalanceHidden = state.isBalanceHidden) - - tokensListData(state = state) - - item { SpacerH32() } - } - - state.marketsState?.let(::swapMarketsListItems) -} - private fun LazyListScope.warningOrSearchBar(state: TokenListUM, itemModifier: Modifier) { if (state.warning == null) { searchBarItem(searchBarUM = state.searchBarUM, modifier = itemModifier) @@ -161,30 +105,6 @@ private fun LazyListScope.searchBarItem(searchBarUM: SearchBarUM, modifier: Modi } } -private fun LazyListScope.assetsTitle(count: Int, showCount: Boolean) { - item(key = "assets_title") { - Text( - text = buildAnnotatedString { - append(stringResourceSafe(R.string.swap_your_assets_title)) - if (showCount) { - withStyle(SpanStyle(color = TangemTheme.colors.text.tertiary)) { - append(" $count") - } - } - }, - style = TangemTheme.typography.h3, - color = TangemTheme.colors.text.primary1, - modifier = Modifier - .fillMaxWidth() - .padding( - start = TangemTheme.dimens.spacing16, - end = TangemTheme.dimens.spacing16, - top = TangemTheme.dimens.spacing12, - ), - ) - } -} - private fun LazyListScope.tokensList(items: ImmutableList, isBalanceHidden: Boolean) { itemsIndexed( items = items, diff --git a/features/push-notification-settings/impl/src/main/kotlin/com/tangem/features/pushnotificationsettings/impl/model/PushNotificationSettingsModel.kt b/features/push-notification-settings/impl/src/main/kotlin/com/tangem/features/pushnotificationsettings/impl/model/PushNotificationSettingsModel.kt index cbc841a27c..5e4e88cda0 100644 --- a/features/push-notification-settings/impl/src/main/kotlin/com/tangem/features/pushnotificationsettings/impl/model/PushNotificationSettingsModel.kt +++ b/features/push-notification-settings/impl/src/main/kotlin/com/tangem/features/pushnotificationsettings/impl/model/PushNotificationSettingsModel.kt @@ -163,7 +163,6 @@ internal class PushNotificationSettingsModel @Inject constructor( return TOGGLE_ORDER .asSequence() .map { id -> id.spec(prefs) } - .filter { it.preference.isVisible } .map { spec -> ToggleUM( id = spec.id, diff --git a/features/push-notification-settings/impl/src/test/kotlin/com/tangem/features/pushnotificationsettings/impl/model/PushNotificationSettingsModelTest.kt b/features/push-notification-settings/impl/src/test/kotlin/com/tangem/features/pushnotificationsettings/impl/model/PushNotificationSettingsModelTest.kt index 500cfcf9b6..a747c404c4 100644 --- a/features/push-notification-settings/impl/src/test/kotlin/com/tangem/features/pushnotificationsettings/impl/model/PushNotificationSettingsModelTest.kt +++ b/features/push-notification-settings/impl/src/test/kotlin/com/tangem/features/pushnotificationsettings/impl/model/PushNotificationSettingsModelTest.kt @@ -286,14 +286,14 @@ class PushNotificationSettingsModelTest { } private fun allFalse() = WalletPushNotificationPreferences( - transactionAlerts = PushNotificationPreference(isEnabled = false, isVisible = true), - offersUpdates = PushNotificationPreference(isEnabled = false, isVisible = true), - priceAlerts = PushNotificationPreference(isEnabled = false, isVisible = true), + transactionAlerts = PushNotificationPreference(isEnabled = false), + offersUpdates = PushNotificationPreference(isEnabled = false), + priceAlerts = PushNotificationPreference(isEnabled = false), ) private fun anyOn() = WalletPushNotificationPreferences( - transactionAlerts = PushNotificationPreference(isEnabled = true, isVisible = true), - offersUpdates = PushNotificationPreference(isEnabled = false, isVisible = true), - priceAlerts = PushNotificationPreference(isEnabled = false, isVisible = true), + transactionAlerts = PushNotificationPreference(isEnabled = true), + offersUpdates = PushNotificationPreference(isEnabled = false), + priceAlerts = PushNotificationPreference(isEnabled = false), ) } \ No newline at end of file diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/callbacks/FeeSelectorModelCallback.kt b/features/send/api/src/main/java/com/tangem/features/send/api/callbacks/FeeSelectorModelCallback.kt deleted file mode 100644 index 429b0bf0e4..0000000000 --- a/features/send/api/src/main/java/com/tangem/features/send/api/callbacks/FeeSelectorModelCallback.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.tangem.features.send.api.callbacks - -import com.tangem.features.send.api.entity.FeeSelectorUM - -interface FeeSelectorModelCallback { - fun onFeeResult(feeSelectorUM: FeeSelectorUM) -} \ No newline at end of file diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/amount/AmountRoute.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/amount/AmountRoute.kt new file mode 100644 index 0000000000..afcdebbae2 --- /dev/null +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/amount/AmountRoute.kt @@ -0,0 +1,8 @@ +package com.tangem.features.send.api.subcomponents.amount + +/** + * Common route for amount + */ +interface AmountRoute { + val isEditMode: Boolean +} \ No newline at end of file diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/amount/SendAmountBlockComponent.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/amount/SendAmountBlockComponent.kt new file mode 100644 index 0000000000..ebed359d91 --- /dev/null +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/amount/SendAmountBlockComponent.kt @@ -0,0 +1,19 @@ +package com.tangem.features.send.api.subcomponents.amount + +import com.tangem.common.ui.amountScreen.models.AmountState +import com.tangem.core.decompose.context.AppComponentContext +import com.tangem.core.ui.decompose.ComposableContentComponent + +interface SendAmountBlockComponent : ComposableContentComponent { + + fun updateState(amountUM: AmountState) + + interface Factory { + fun create( + context: AppComponentContext, + params: SendAmountComponentParams.AmountBlockParams, + onClick: () -> Unit, + onResult: (AmountState) -> Unit, + ): SendAmountBlockComponent + } +} \ No newline at end of file diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/amount/SendAmountComponent.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/amount/SendAmountComponent.kt new file mode 100644 index 0000000000..79e3d44a57 --- /dev/null +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/amount/SendAmountComponent.kt @@ -0,0 +1,21 @@ +package com.tangem.features.send.api.subcomponents.amount + +import com.tangem.common.ui.amountScreen.models.AmountState +import com.tangem.common.ui.navigationButtons.NavigationModelCallback +import com.tangem.core.decompose.factory.ComponentFactory +import com.tangem.core.ui.decompose.ComposableContentComponent +import com.tangem.domain.wallets.models.errors.GetUserWalletError + +interface SendAmountComponent : ComposableContentComponent { + + fun updateState(amountUM: AmountState) + + interface ModelCallback : NavigationModelCallback { + fun onAmountResult(amountUM: AmountState, isResetPredefined: Boolean) + fun onConvertToAnotherToken(lastAmount: String, isEnterInFiatSelected: Boolean) + fun resetSendNavigation() + fun onError(error: GetUserWalletError) + } + + interface Factory : ComponentFactory +} \ No newline at end of file diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/SendAmountComponentParams.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/amount/SendAmountComponentParams.kt similarity index 92% rename from features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/SendAmountComponentParams.kt rename to features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/amount/SendAmountComponentParams.kt index 88427bed4c..bda588bfee 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/SendAmountComponentParams.kt +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/amount/SendAmountComponentParams.kt @@ -1,4 +1,4 @@ -package com.tangem.features.send.subcomponents.amount +package com.tangem.features.send.api.subcomponents.amount import com.tangem.common.ui.amountScreen.models.AmountState import com.tangem.domain.appcurrency.model.AppCurrency @@ -9,10 +9,10 @@ import com.tangem.domain.models.wallet.UserWallet import com.tangem.domain.models.wallet.UserWalletId import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents import com.tangem.features.send.api.entity.PredefinedValues -import com.tangem.features.send.common.CommonSendRoute +import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.StateFlow -internal sealed class SendAmountComponentParams { +sealed class SendAmountComponentParams { abstract val state: AmountState abstract val analyticsCategoryName: String @@ -39,7 +39,7 @@ internal sealed class SendAmountComponentParams { override val accountFlow: StateFlow, override val isAccountModeFlow: StateFlow, val callback: SendAmountComponent.ModelCallback, - val currentRoute: StateFlow, + val currentRoute: Flow, ) : SendAmountComponentParams() data class AmountBlockParams( diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/amount/SendAmountReduceTrigger.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/amount/SendAmountReduceTrigger.kt new file mode 100644 index 0000000000..5f923b8d46 --- /dev/null +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/amount/SendAmountReduceTrigger.kt @@ -0,0 +1,39 @@ +package com.tangem.features.send.api.subcomponents.amount + +import com.tangem.common.ui.amountScreen.converters.AmountReduceByTransformer +import kotlinx.coroutines.flow.Flow +import java.math.BigDecimal + +/** + * Trigger for reducing amount from another component + */ +interface SendAmountReduceTrigger { + suspend fun triggerReduceBy(reduceBy: AmountReduceByTransformer.ReduceByData) + suspend fun triggerReduceTo(reduceTo: BigDecimal) + suspend fun triggerIgnoreReduce() +} + +/** + * Trigger for reducing amount from another component + */ +interface SendAmountReduceListener { + val reduceToTriggerFlow: Flow + val reduceByTriggerFlow: Flow + val ignoreReduceTriggerFlow: Flow +} + +/** + * Trigger amount change from another component. + * Different from another triggers because it takes raw string instead of BigDecimal + */ +interface SendAmountUpdateTrigger { + suspend fun triggerUpdateAmount(amountValue: String, isEnterInFiatSelected: Boolean?) +} + +/** + * Trigger amount change from another component. + * Different from another triggers because it takes raw string instead of BigDecimal + */ +interface SendAmountUpdateListener { + val updateAmountTriggerFlow: Flow> +} \ No newline at end of file diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/destination/SendDestinationComponentParams.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/destination/SendDestinationComponentParams.kt index e4879499a7..ead4f35164 100644 --- a/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/destination/SendDestinationComponentParams.kt +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/destination/SendDestinationComponentParams.kt @@ -40,5 +40,6 @@ sealed class SendDestinationComponentParams { val blockClickEnableFlow: StateFlow, val predefinedValues: PredefinedValues, override val isAllowSelfSend: Boolean = false, + val isAddContactAvailable: Boolean = false, ) : SendDestinationComponentParams() } \ No newline at end of file diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/destination/entity/DestinationTextFieldUM.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/destination/entity/DestinationTextFieldUM.kt index 00dc80f599..943d1e5a93 100644 --- a/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/destination/entity/DestinationTextFieldUM.kt +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/destination/entity/DestinationTextFieldUM.kt @@ -2,6 +2,7 @@ package com.tangem.features.send.api.subcomponents.destination.entity import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.runtime.Immutable +import com.tangem.common.ui.account.AccountIconUM import com.tangem.core.ui.extensions.TextReference import com.tangem.utils.toBriefAddressFormat @@ -24,6 +25,8 @@ sealed class DestinationTextFieldUM { val isValuePasted: Boolean, // if value is human-readable address, this field contains the actual blockchain address val blockchainAddress: String? = null, + val contactName: String? = null, + val contactIcon: AccountIconUM.CryptoPortfolio? = null, ) : DestinationTextFieldUM() { val actualAddress: String diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/FeeSelectorBlockComponent.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/FeeSelectorBlockComponent.kt similarity index 68% rename from features/send/api/src/main/java/com/tangem/features/send/api/FeeSelectorBlockComponent.kt rename to features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/FeeSelectorBlockComponent.kt index ba927c8159..c4591a5fd2 100644 --- a/features/send/api/src/main/java/com/tangem/features/send/api/FeeSelectorBlockComponent.kt +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/FeeSelectorBlockComponent.kt @@ -1,9 +1,9 @@ -package com.tangem.features.send.api +package com.tangem.features.send.api.subcomponents.feeSelector import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.ui.decompose.ComposableContentComponent -import com.tangem.features.send.api.entity.FeeSelectorUM -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams interface FeeSelectorBlockComponent : ComposableContentComponent { diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/FeeSelectorComponent.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/FeeSelectorComponent.kt similarity index 73% rename from features/send/api/src/main/java/com/tangem/features/send/api/FeeSelectorComponent.kt rename to features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/FeeSelectorComponent.kt index ec13f68cb9..edd11d22c5 100644 --- a/features/send/api/src/main/java/com/tangem/features/send/api/FeeSelectorComponent.kt +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/FeeSelectorComponent.kt @@ -1,8 +1,8 @@ -package com.tangem.features.send.api +package com.tangem.features.send.api.subcomponents.feeSelector import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.ui.decompose.ComposableBottomSheetComponent -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams interface FeeSelectorComponent : ComposableBottomSheetComponent { interface Factory { diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/callbacks/FeeSelectorModelCallback.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/callbacks/FeeSelectorModelCallback.kt new file mode 100644 index 0000000000..894bc190eb --- /dev/null +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/callbacks/FeeSelectorModelCallback.kt @@ -0,0 +1,7 @@ +package com.tangem.features.send.api.subcomponents.feeSelector.callbacks + +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM + +interface FeeSelectorModelCallback { + fun onFeeResult(feeSelectorUM: FeeSelectorUM) +} \ No newline at end of file diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/entity/CustomFeeFieldUM.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/entity/CustomFeeFieldUM.kt similarity index 89% rename from features/send/api/src/main/java/com/tangem/features/send/api/entity/CustomFeeFieldUM.kt rename to features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/entity/CustomFeeFieldUM.kt index 7fbc332f08..7929b04fee 100644 --- a/features/send/api/src/main/java/com/tangem/features/send/api/entity/CustomFeeFieldUM.kt +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/entity/CustomFeeFieldUM.kt @@ -1,4 +1,4 @@ -package com.tangem.features.send.api.entity +package com.tangem.features.send.api.subcomponents.feeSelector.entity import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/entity/FeeSelectorUM.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/entity/FeeSelectorUM.kt similarity index 98% rename from features/send/api/src/main/java/com/tangem/features/send/api/entity/FeeSelectorUM.kt rename to features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/entity/FeeSelectorUM.kt index dbbdb74b2a..e370e2bd8a 100644 --- a/features/send/api/src/main/java/com/tangem/features/send/api/entity/FeeSelectorUM.kt +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/entity/FeeSelectorUM.kt @@ -1,4 +1,4 @@ -package com.tangem.features.send.api.entity +package com.tangem.features.send.api.subcomponents.feeSelector.entity import androidx.compose.runtime.Immutable import com.tangem.blockchain.common.Amount diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/params/FeeSelectorParams.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/params/FeeSelectorParams.kt similarity index 93% rename from features/send/api/src/main/java/com/tangem/features/send/api/params/FeeSelectorParams.kt rename to features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/params/FeeSelectorParams.kt index 138dcbbf64..39bec2048a 100644 --- a/features/send/api/src/main/java/com/tangem/features/send/api/params/FeeSelectorParams.kt +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/params/FeeSelectorParams.kt @@ -1,4 +1,4 @@ -package com.tangem.features.send.api.params +package com.tangem.features.send.api.subcomponents.feeSelector.params import arrow.core.Either import com.tangem.blockchain.common.transaction.Fee @@ -9,8 +9,8 @@ import com.tangem.domain.models.wallet.UserWalletId import com.tangem.domain.transaction.error.GetFeeError import com.tangem.domain.transaction.models.TransactionFeeExtended import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents -import com.tangem.features.send.api.callbacks.FeeSelectorModelCallback -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.callbacks.FeeSelectorModelCallback +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM sealed class FeeSelectorParams { abstract val state: FeeSelectorUM diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/utils/FeeCalculationUtils.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/utils/FeeCalculationUtils.kt index 0890d36b63..65835565d1 100644 --- a/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/utils/FeeCalculationUtils.kt +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/utils/FeeCalculationUtils.kt @@ -4,8 +4,8 @@ import com.tangem.blockchain.common.transaction.TransactionFee import com.tangem.core.ui.utils.parseBigDecimal import com.tangem.core.ui.utils.parseToBigDecimal import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.utils.extensions.isZero import java.math.BigDecimal import java.math.RoundingMode diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/SendNotificationsComponent.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/notifications/SendNotificationsComponent.kt similarity index 96% rename from features/send/api/src/main/java/com/tangem/features/send/api/SendNotificationsComponent.kt rename to features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/notifications/SendNotificationsComponent.kt index 1a468d979c..157fdbdb0f 100644 --- a/features/send/api/src/main/java/com/tangem/features/send/api/SendNotificationsComponent.kt +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/notifications/SendNotificationsComponent.kt @@ -1,4 +1,4 @@ -package com.tangem.features.send.api +package com.tangem.features.send.api.subcomponents.notifications import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.ui.Modifier diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/notifications/SendNotificationsUpdateListener.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/notifications/SendNotificationsUpdateListener.kt index 74354016a5..b0099072c3 100644 --- a/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/notifications/SendNotificationsUpdateListener.kt +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/notifications/SendNotificationsUpdateListener.kt @@ -1,6 +1,5 @@ package com.tangem.features.send.api.subcomponents.notifications -import com.tangem.features.send.api.SendNotificationsComponent import kotlinx.coroutines.flow.Flow interface SendNotificationsUpdateListener { diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/notifications/SendNotificationsUpdateTrigger.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/notifications/SendNotificationsUpdateTrigger.kt index aad417f873..f6e8e4a273 100644 --- a/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/notifications/SendNotificationsUpdateTrigger.kt +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/notifications/SendNotificationsUpdateTrigger.kt @@ -1,7 +1,5 @@ package com.tangem.features.send.api.subcomponents.notifications -import com.tangem.features.send.api.SendNotificationsComponent - interface SendNotificationsUpdateTrigger { /** Trigger return callback with check result */ suspend fun callbackHasError(hasError: Boolean) diff --git a/features/send/impl/build.gradle.kts b/features/send/impl/build.gradle.kts index d5b2231051..d57e08c9b0 100644 --- a/features/send/impl/build.gradle.kts +++ b/features/send/impl/build.gradle.kts @@ -17,6 +17,7 @@ dependencies { implementation(projects.features.nft.api) implementation(projects.features.swapV2.api) implementation(projects.features.manageTokens.api) + implementation(projects.features.addressBook.api) /** Libs */ implementation(projects.libs.crypto) @@ -68,6 +69,7 @@ dependencies { implementation(projects.domain.swap.models) implementation(projects.domain.account) implementation(projects.domain.account.status) + implementation(projects.domain.addressBook) implementation(projects.domain.transaction) diff --git a/features/send/impl/src/main/java/com/tangem/features/send/common/CommonSendRoute.kt b/features/send/impl/src/main/java/com/tangem/features/send/common/CommonSendRoute.kt index 398176faea..c098d9b414 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/common/CommonSendRoute.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/common/CommonSendRoute.kt @@ -1,6 +1,7 @@ package com.tangem.features.send.common import com.tangem.core.decompose.navigation.Route +import com.tangem.features.send.api.subcomponents.amount.AmountRoute import com.tangem.features.send.api.subcomponents.destination.DestinationRoute import kotlinx.serialization.Serializable @@ -31,5 +32,5 @@ internal sealed class CommonSendRoute : Route { @Serializable data class Amount( override val isEditMode: Boolean, - ) : CommonSendRoute() + ) : CommonSendRoute(), AmountRoute } \ No newline at end of file diff --git a/features/send/impl/src/main/java/com/tangem/features/send/common/ui/FeeBlockSuccess.kt b/features/send/impl/src/main/java/com/tangem/features/send/common/ui/FeeBlockSuccess.kt index 4bd2d8d965..9e1dd361d2 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/common/ui/FeeBlockSuccess.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/common/ui/FeeBlockSuccess.kt @@ -15,7 +15,7 @@ import com.tangem.core.ui.format.bigdecimal.crypto import com.tangem.core.ui.format.bigdecimal.fee import com.tangem.core.ui.format.bigdecimal.format import com.tangem.core.ui.res.TangemTheme -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.impl.R @Composable diff --git a/features/send/impl/src/main/java/com/tangem/features/send/di/SendFeatureModule.kt b/features/send/impl/src/main/java/com/tangem/features/send/di/SendFeatureModule.kt index e3dd12db2f..7efcca40ff 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/di/SendFeatureModule.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/di/SendFeatureModule.kt @@ -5,7 +5,7 @@ import com.tangem.features.send.api.NFTSendComponent import com.tangem.features.send.api.SendComponent import com.tangem.features.send.api.SendEntryPointComponent import com.tangem.features.send.api.SendFeatureToggles -import com.tangem.features.send.api.SendNotificationsComponent +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent import com.tangem.features.send.entrypoint.DefaultSendEntryPointComponent import com.tangem.features.send.send.DefaultSendComponent import com.tangem.features.send.sendnft.DefaultNFTSendComponent diff --git a/features/send/impl/src/main/java/com/tangem/features/send/entrypoint/model/SendEntryPointModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/entrypoint/model/SendEntryPointModel.kt index 0572ea6bd3..c759ab49fe 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/entrypoint/model/SendEntryPointModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/entrypoint/model/SendEntryPointModel.kt @@ -10,7 +10,7 @@ import com.tangem.features.managetokens.component.ChooseManagedTokensComponent import com.tangem.features.send.api.SendComponent import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents import com.tangem.features.send.api.entry.SendEntryRoute -import com.tangem.features.send.subcomponents.amount.SendAmountUpdateTrigger +import com.tangem.features.send.api.subcomponents.amount.SendAmountUpdateTrigger import com.tangem.features.swap.v2.api.SendWithSwapComponent import com.tangem.features.swap.v2.api.subcomponents.SwapAmountUpdateTrigger import com.tangem.utils.coroutines.CoroutineDispatcherProvider diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/DefaultFeeSelectorBlockComponent.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/DefaultFeeSelectorBlockComponent.kt index 7c659cabe7..0d36c2717f 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/DefaultFeeSelectorBlockComponent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/DefaultFeeSelectorBlockComponent.kt @@ -12,10 +12,10 @@ import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.decompose.context.childByContext import com.tangem.core.decompose.model.getOrCreateModel import com.tangem.core.ui.extensions.conditional -import com.tangem.features.send.api.FeeSelectorBlockComponent -import com.tangem.features.send.api.FeeSelectorComponent -import com.tangem.features.send.api.entity.FeeSelectorUM -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorComponent +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams import com.tangem.features.send.feeselector.model.FeeSelectorBlockModel import com.tangem.features.send.feeselector.ui.FeeSelectorBlockContent import com.tangem.utils.extensions.isSingleItem diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/DefaultFeeSelectorComponent.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/DefaultFeeSelectorComponent.kt index 83f48ddc42..b7da023cbe 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/DefaultFeeSelectorComponent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/DefaultFeeSelectorComponent.kt @@ -12,8 +12,8 @@ import com.tangem.core.decompose.context.childByContext import com.tangem.core.decompose.model.getOrCreateModel import com.tangem.core.decompose.navigation.inner.InnerRouter import com.tangem.core.ui.decompose.ComposableContentComponent -import com.tangem.features.send.api.FeeSelectorComponent -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorComponent +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams import com.tangem.features.send.feeselector.component.FeeSelectorComponentParams import com.tangem.features.send.feeselector.component.extended.FeeExtendedSelectorComponent import com.tangem.features.send.feeselector.component.speed.FeeSpeedSelectorComponent diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/FeeSelectorComponentParams.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/FeeSelectorComponentParams.kt index c3d08ae74a..0ea1d30cc8 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/FeeSelectorComponentParams.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/FeeSelectorComponentParams.kt @@ -1,7 +1,7 @@ package com.tangem.features.send.feeselector.component -import com.tangem.features.send.api.entity.FeeSelectorUM -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams import com.tangem.features.send.feeselector.model.FeeSelectorIntents import kotlinx.coroutines.flow.MutableStateFlow diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/extended/entity/FeeExtendedSelectorUM.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/extended/entity/FeeExtendedSelectorUM.kt index b9d3ec3795..61522ca99a 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/extended/entity/FeeExtendedSelectorUM.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/extended/entity/FeeExtendedSelectorUM.kt @@ -2,8 +2,8 @@ package com.tangem.features.send.feeselector.component.extended.entity import androidx.compose.runtime.Immutable import com.tangem.core.ui.components.token.state.TokenItemState -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM @Immutable data class FeeExtendedSelectorUM( diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/extended/model/FeeExtendedSelectorModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/extended/model/FeeExtendedSelectorModel.kt index 65a0fb932e..f561191964 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/extended/model/FeeExtendedSelectorModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/extended/model/FeeExtendedSelectorModel.kt @@ -8,7 +8,7 @@ import com.tangem.core.decompose.model.ParamsContainer import com.tangem.core.decompose.navigation.Router import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase import com.tangem.domain.appcurrency.model.AppCurrency -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.feeselector.component.FeeSelectorComponentParams import com.tangem.features.send.feeselector.component.extended.entity.FeeExtendedSelectorUM import com.tangem.features.send.feeselector.route.FeeSelectorRoute diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/extended/ui/FeeExtendedSelectorContent.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/extended/ui/FeeExtendedSelectorContent.kt index a9c2c36ea4..7ffb08ae15 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/extended/ui/FeeExtendedSelectorContent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/extended/ui/FeeExtendedSelectorContent.kt @@ -33,11 +33,11 @@ import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus import com.tangem.domain.models.network.Network -import com.tangem.features.send.api.entity.FeeExtraInfo -import com.tangem.features.send.api.entity.FeeFiatRateUM -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeExtraInfo +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeFiatRateUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.feeselector.component.extended.entity.FeeExtendedSelectorUM import com.tangem.features.send.feeselector.component.speed.ui.RegularFeeItemContent import kotlinx.collections.immutable.persistentListOf diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/speed/FeeSpeedSelectorComponent.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/speed/FeeSpeedSelectorComponent.kt index 92f17a436f..114f1e6a30 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/speed/FeeSpeedSelectorComponent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/speed/FeeSpeedSelectorComponent.kt @@ -7,7 +7,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.decompose.model.getOrCreateModel import com.tangem.core.ui.decompose.ComposableContentComponent -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.feeselector.component.FeeSelectorComponentParams import com.tangem.features.send.feeselector.component.speed.model.FeeSpeedSelectorModel import com.tangem.features.send.feeselector.component.speed.ui.FeeSpeedSelectorContent diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/speed/model/FeeSpeedSelectorModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/speed/model/FeeSpeedSelectorModel.kt index cf1d5205d9..886bc2f9fe 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/speed/model/FeeSpeedSelectorModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/speed/model/FeeSpeedSelectorModel.kt @@ -6,7 +6,7 @@ import com.tangem.core.decompose.di.ModelScoped import com.tangem.core.decompose.model.Model import com.tangem.core.decompose.model.ParamsContainer import com.tangem.core.navigation.url.UrlOpener -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.feeselector.component.FeeSelectorComponentParams import com.tangem.features.send.feeselector.component.speed.FeeSpeedSelectorIntents import com.tangem.features.send.feeselector.model.FeeSelectorIntents diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/speed/ui/FeeSpeedSelectorContent.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/speed/ui/FeeSpeedSelectorContent.kt index acf86c17b2..a83404da68 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/speed/ui/FeeSpeedSelectorContent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/speed/ui/FeeSpeedSelectorContent.kt @@ -54,12 +54,12 @@ import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus import com.tangem.domain.models.network.Network -import com.tangem.features.send.api.entity.CustomFeeFieldUM -import com.tangem.features.send.api.entity.FeeExtraInfo -import com.tangem.features.send.api.entity.FeeFiatRateUM -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.CustomFeeFieldUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeExtraInfo +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeFiatRateUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.feeselector.component.speed.FeeSpeedSelectorIntents import com.tangem.features.send.feeselector.component.speed.StubFeeSpeedSelectorIntents import com.tangem.features.send.impl.R diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/token/entity/FeeTokenSelectorUM.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/token/entity/FeeTokenSelectorUM.kt index eda8e96501..08ce22781e 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/token/entity/FeeTokenSelectorUM.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/token/entity/FeeTokenSelectorUM.kt @@ -1,6 +1,6 @@ package com.tangem.features.send.feeselector.component.token.entity -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import kotlinx.collections.immutable.ImmutableList internal data class FeeTokenSelectorUM( diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/token/model/FeeTokenSelectorModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/token/model/FeeTokenSelectorModel.kt index 74412b11e3..e89e0ceeff 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/token/model/FeeTokenSelectorModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/token/model/FeeTokenSelectorModel.kt @@ -10,7 +10,7 @@ import com.tangem.core.navigation.url.UrlOpener import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.feeselector.component.FeeSelectorComponentParams import com.tangem.features.send.feeselector.component.token.FeeTokenSelectorIntents import com.tangem.features.send.feeselector.component.token.entity.FeeTokenItemState diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/token/ui/FeeTokenSelectorContent.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/token/ui/FeeTokenSelectorContent.kt index ea55af5078..d037607d2c 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/token/ui/FeeTokenSelectorContent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/token/ui/FeeTokenSelectorContent.kt @@ -36,11 +36,11 @@ import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus import com.tangem.domain.models.network.Network -import com.tangem.features.send.api.entity.FeeExtraInfo -import com.tangem.features.send.api.entity.FeeFiatRateUM -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeExtraInfo +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeFiatRateUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.feeselector.component.token.FeeTokenSelectorIntents import com.tangem.features.send.feeselector.component.token.StubFeeTokenSelectorIntents import com.tangem.features.send.feeselector.component.token.entity.FeeTokenItemState diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/di/FeeSelectorFeatureModule.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/di/FeeSelectorFeatureModule.kt index dbe05e5489..46f9b441e9 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/di/FeeSelectorFeatureModule.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/di/FeeSelectorFeatureModule.kt @@ -1,7 +1,7 @@ package com.tangem.features.send.feeselector.di -import com.tangem.features.send.api.FeeSelectorBlockComponent -import com.tangem.features.send.api.FeeSelectorComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorComponent import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorCheckReloadListener import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorCheckReloadTrigger import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorReloadListener diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorAlertFactory.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorAlertFactory.kt index 3f4a77ef8f..f3d172f9c8 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorAlertFactory.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorAlertFactory.kt @@ -7,8 +7,8 @@ import com.tangem.core.ui.extensions.resourceReference import com.tangem.core.ui.extensions.wrappedList import com.tangem.core.ui.message.DialogMessage import com.tangem.core.ui.message.EventMessageAction -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils import com.tangem.features.send.impl.R import java.math.BigDecimal diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorBlockModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorBlockModel.kt index 4a6cd83145..207cdc1138 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorBlockModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorBlockModel.kt @@ -13,9 +13,9 @@ import com.tangem.core.navigation.url.UrlOpener import com.tangem.domain.settings.NeverShowTapHelpUseCase import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents.SendScreenSource -import com.tangem.features.send.api.callbacks.FeeSelectorModelCallback -import com.tangem.features.send.api.entity.FeeSelectorUM -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.callbacks.FeeSelectorModelCallback +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams import com.tangem.utils.coroutines.CoroutineDispatcherProvider import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorIntents.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorIntents.kt index 91b38c7ea4..951d7ed573 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorIntents.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorIntents.kt @@ -2,7 +2,7 @@ package com.tangem.features.send.feeselector.model import androidx.compose.runtime.Stable import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem @Stable internal interface FeeSelectorIntents { diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorLogic.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorLogic.kt index b7f6258ee8..2f91b062fb 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorLogic.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorLogic.kt @@ -21,10 +21,10 @@ import com.tangem.domain.transaction.usecase.gasless.GetAvailableFeeTokensUseCas import com.tangem.domain.transaction.usecase.gasless.IsGaslessFeeSupportedForNetwork import com.tangem.domain.wallets.usecase.GetUserWalletUseCase import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents.NonceInserted -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.entity.FeeSelectorUM -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorCheckReloadListener import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorCheckReloadTrigger import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorReloadListener diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorModel.kt index 548b0d7cb2..a5e24c65b7 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorModel.kt @@ -10,9 +10,9 @@ import com.tangem.core.decompose.model.ParamsContainer import com.tangem.core.decompose.utils.stack import com.tangem.domain.models.currency.CryptoCurrencyStatus import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeSelectorUM -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams import com.tangem.features.send.feeselector.route.FeeSelectorRoute import com.tangem.utils.coroutines.CoroutineDispatcherProvider import com.tangem.utils.extensions.isSingleItem diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeItemConverter.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeItemConverter.kt index c448124c08..0643b62c3c 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeItemConverter.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeItemConverter.kt @@ -4,8 +4,8 @@ import com.tangem.blockchain.common.transaction.Fee import com.tangem.blockchain.common.transaction.TransactionFee import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams import com.tangem.features.send.feeselector.model.FeeSelectorIntents import com.tangem.utils.converter.Converter import kotlinx.collections.immutable.ImmutableList diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeItemSelectedTransformer.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeItemSelectedTransformer.kt index ae47af1087..6d13550602 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeItemSelectedTransformer.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeItemSelectedTransformer.kt @@ -1,7 +1,7 @@ package com.tangem.features.send.feeselector.model.transformers -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.utils.transformer.Transformer internal class FeeItemSelectedTransformer(private val selectedFeeItem: FeeItem) : Transformer { diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorCustomFieldConverter.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorCustomFieldConverter.kt index ffbbeb9d55..28946cd5da 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorCustomFieldConverter.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorCustomFieldConverter.kt @@ -5,8 +5,8 @@ import com.tangem.blockchain.common.transaction.TransactionFee import com.tangem.core.ui.utils.parseToBigDecimal import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.CustomFeeFieldUM -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.CustomFeeFieldUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.feeselector.model.FeeSelectorIntents import com.tangem.features.send.subcomponents.fee.model.converters.custom.bitcoin.BitcoinCustomFeeConverter import com.tangem.features.send.subcomponents.fee.model.converters.custom.ethereum.EthereumCustomFeeConverter diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorCustomValueChangedTransformer.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorCustomValueChangedTransformer.kt index 847e634471..d3efc25f19 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorCustomValueChangedTransformer.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorCustomValueChangedTransformer.kt @@ -3,8 +3,8 @@ package com.tangem.features.send.feeselector.model.transformers import com.tangem.core.ui.utils.parseToBigDecimal import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.feeselector.model.FeeSelectorIntents import com.tangem.utils.extensions.isZero import com.tangem.utils.transformer.Transformer diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorErrorTransformer.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorErrorTransformer.kt index 9b6d41ac15..b6d5f6ad11 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorErrorTransformer.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorErrorTransformer.kt @@ -1,7 +1,7 @@ package com.tangem.features.send.feeselector.model.transformers import com.tangem.domain.transaction.error.GetFeeError -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.utils.transformer.Transformer internal class FeeSelectorErrorTransformer(private val error: GetFeeError) : Transformer { diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorLoadedTransformer.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorLoadedTransformer.kt index f1b4d6bdf2..691ee4e80e 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorLoadedTransformer.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorLoadedTransformer.kt @@ -4,12 +4,12 @@ import com.tangem.blockchain.common.transaction.Fee import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.FeeExtraInfo -import com.tangem.features.send.api.entity.FeeFiatRateUM -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.entity.FeeSelectorUM -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeExtraInfo +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeFiatRateUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams import com.tangem.features.send.feeselector.model.FeeSelectorIntents import com.tangem.features.send.feeselector.model.FeeSelectorLogic import com.tangem.lib.crypto.BlockchainUtils.isTron diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorLoadingTransformer.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorLoadingTransformer.kt index 9ae1f81ee4..41b5cdcdea 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorLoadingTransformer.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorLoadingTransformer.kt @@ -1,6 +1,6 @@ package com.tangem.features.send.feeselector.model.transformers -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.utils.transformer.Transformer internal object FeeSelectorLoadingTransformer : Transformer { diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorNonceChangeTransformer.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorNonceChangeTransformer.kt index 5225d3abaf..75081f5f55 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorNonceChangeTransformer.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorNonceChangeTransformer.kt @@ -1,7 +1,7 @@ package com.tangem.features.send.feeselector.model.transformers -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.utils.transformer.Transformer internal class FeeSelectorNonceChangeTransformer( diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorRemoveSuggestedTransformer.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorRemoveSuggestedTransformer.kt index 7c6cae3fd0..530acc9494 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorRemoveSuggestedTransformer.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorRemoveSuggestedTransformer.kt @@ -1,7 +1,7 @@ package com.tangem.features.send.feeselector.model.transformers -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.utils.transformer.Transformer import kotlinx.collections.immutable.toImmutableList diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorTokenSelectedTransformer.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorTokenSelectedTransformer.kt index e732f6629c..56bef3a944 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorTokenSelectedTransformer.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorTokenSelectedTransformer.kt @@ -1,8 +1,8 @@ package com.tangem.features.send.feeselector.model.transformers import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.utils.transformer.Transformer import kotlinx.collections.immutable.persistentListOf diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/ui/FeeSelectorBlockContent.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/ui/FeeSelectorBlockContent.kt index 2ea1b4e78d..ccec69fca1 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/ui/FeeSelectorBlockContent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/ui/FeeSelectorBlockContent.kt @@ -46,11 +46,11 @@ import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus import com.tangem.domain.models.network.Network import com.tangem.domain.transaction.error.GetFeeError -import com.tangem.features.send.api.entity.FeeExtraInfo -import com.tangem.features.send.api.entity.FeeFiatRateUM -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeExtraInfo +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeFiatRateUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.impl.R import com.tangem.utils.extensions.isSingleItem import kotlinx.collections.immutable.persistentListOf diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/ui/FeeSelectorModalBottomSheet.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/ui/FeeSelectorModalBottomSheet.kt index 7a710a0ca9..2e867817c8 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/ui/FeeSelectorModalBottomSheet.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/ui/FeeSelectorModalBottomSheet.kt @@ -20,9 +20,9 @@ import com.tangem.core.ui.components.bottomsheets.modal.TangemModalBottomSheetWi import com.tangem.core.ui.decompose.ComposableContentComponent import com.tangem.core.ui.extensions.stringResourceSafe import com.tangem.core.ui.res.TangemTheme -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeSelectorUM -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams import com.tangem.features.send.feeselector.model.FeeSelectorIntents import com.tangem.features.send.feeselector.route.FeeSelectorRoute import com.tangem.features.send.impl.R diff --git a/features/send/impl/src/main/java/com/tangem/features/send/send/DefaultSendComponent.kt b/features/send/impl/src/main/java/com/tangem/features/send/send/DefaultSendComponent.kt index dc13b7b071..a44f29903c 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/send/DefaultSendComponent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/send/DefaultSendComponent.kt @@ -28,27 +28,27 @@ import com.tangem.core.ui.decompose.ComposableContentComponent import com.tangem.core.ui.extensions.resourceReference import com.tangem.core.ui.res.TangemTheme import com.tangem.domain.models.account.derivationIndex -import com.tangem.features.send.api.FeeSelectorBlockComponent import com.tangem.features.send.api.SendComponent import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents +import com.tangem.features.send.api.subcomponents.amount.SendAmountComponent +import com.tangem.features.send.api.subcomponents.amount.SendAmountComponentParams +import com.tangem.features.send.api.subcomponents.destination.SendDestinationComponent import com.tangem.features.send.api.subcomponents.destination.SendDestinationComponentParams import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent import com.tangem.features.send.common.CommonSendRoute import com.tangem.features.send.common.ui.SendContent import com.tangem.features.send.common.ui.state.ConfirmUM +import com.tangem.features.send.impl.R import com.tangem.features.send.send.confirm.SendConfirmComponent import com.tangem.features.send.send.model.SendModel import com.tangem.features.send.send.success.SendConfirmSuccessComponent -import com.tangem.features.send.subcomponents.amount.SendAmountComponent -import com.tangem.features.send.subcomponents.amount.SendAmountComponentParams +import com.tangem.features.send.subcomponents.amount.DefaultSendAmountComponent import com.tangem.features.send.subcomponents.destination.DefaultSendDestinationBlockComponent -import com.tangem.features.send.subcomponents.destination.DefaultSendDestinationComponent -import com.tangem.features.send.impl.R import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.launch @@ -57,7 +57,9 @@ internal class DefaultSendComponent @AssistedInject constructor( @Assisted appComponentContext: AppComponentContext, @Assisted private val params: SendComponent.Params, private val analyticsEventHandler: AnalyticsEventHandler, + private val amountComponentFactory: SendAmountComponent.Factory, private val feeSelectorComponentFactory: FeeSelectorBlockComponent.Factory, + private val sendDestinationComponentFactory: SendDestinationComponent.Factory, ) : SendComponent, AppComponentContext by appComponentContext { private val stackNavigation = StackNavigation() @@ -112,7 +114,7 @@ internal class DefaultSendComponent @AssistedInject constructor( activeComponent.updateState(model.uiState.value) } } - is SendAmountComponent -> { + is DefaultSendAmountComponent -> { analyticsEventHandler.send( CommonSendAnalyticEvents.AmountScreenOpened( categoryName = model.analyticCategoryName, @@ -122,7 +124,7 @@ internal class DefaultSendComponent @AssistedInject constructor( ) activeComponent.updateState(model.uiState.value.amountUM) } - is DefaultSendDestinationComponent -> { + is SendDestinationComponent -> { analyticsEventHandler.send( CommonSendAnalyticEvents.AddressScreenOpened( categoryName = model.analyticCategoryName, @@ -162,9 +164,9 @@ internal class DefaultSendComponent @AssistedInject constructor( is CommonSendRoute.ConfirmSuccess -> getConfirmSuccessComponent(factoryContext) } - private fun getDestinationComponent(factoryContext: AppComponentContext): DefaultSendDestinationComponent = - DefaultSendDestinationComponent( - appComponentContext = factoryContext, + private fun getDestinationComponent(factoryContext: AppComponentContext): SendDestinationComponent = + sendDestinationComponentFactory.create( + context = factoryContext, params = SendDestinationComponentParams.DestinationParams( state = model.uiState.value.destinationUM, currentRoute = model.currentRoute.filterIsInstance(), @@ -179,11 +181,11 @@ internal class DefaultSendComponent @AssistedInject constructor( ) private fun getAmountComponent(factoryContext: AppComponentContext): ComposableContentComponent { - return SendAmountComponent( - appComponentContext = factoryContext, + return amountComponentFactory.create( + context = factoryContext, params = SendAmountComponentParams.AmountParams( state = model.uiState.value.amountUM, - currentRoute = model.currentRoute.asStateFlow(), + currentRoute = model.currentRoute.filterIsInstance(), isBalanceHidingFlow = model.isBalanceHiddenFlow, analyticsCategoryName = model.analyticCategoryName, appCurrency = model.appCurrency, @@ -261,6 +263,7 @@ internal class DefaultSendComponent @AssistedInject constructor( cryptoCurrency = cryptoCurrencyStatus.currency, blockClickEnableFlow = MutableStateFlow(true), predefinedValues = model.predefinedValues, + isAddContactAvailable = true, ), onResult = { }, onClick = {}, diff --git a/features/send/impl/src/main/java/com/tangem/features/send/send/analytics/SendAnalyticHelper.kt b/features/send/impl/src/main/java/com/tangem/features/send/send/analytics/SendAnalyticHelper.kt index 051fada063..6fbdf1342d 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/send/analytics/SendAnalyticHelper.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/send/analytics/SendAnalyticHelper.kt @@ -8,8 +8,8 @@ import com.tangem.domain.account.status.usecase.GetAccountCurrencyByAddressUseCa import com.tangem.domain.models.account.Account import com.tangem.domain.models.account.derivationIndex import com.tangem.domain.models.currency.CryptoCurrency -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationTextFieldUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM import com.tangem.features.send.send.ui.state.SendUM diff --git a/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/SendConfirmComponent.kt b/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/SendConfirmComponent.kt index 0b2def8145..6e369f2e78 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/SendConfirmComponent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/SendConfirmComponent.kt @@ -16,20 +16,19 @@ import com.tangem.domain.models.currency.CryptoCurrencyStatus import com.tangem.domain.models.wallet.UserWallet import com.tangem.domain.transaction.error.GetFeeError import com.tangem.domain.transaction.models.TransactionFeeExtended -import com.tangem.features.send.api.FeeSelectorBlockComponent -import com.tangem.features.send.api.SendNotificationsComponent -import com.tangem.features.send.api.SendNotificationsComponent.Params.NotificationData import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents import com.tangem.features.send.api.entity.PredefinedValues -import com.tangem.features.send.api.params.FeeSelectorParams import com.tangem.features.send.api.subcomponents.destination.SendDestinationComponentParams.DestinationBlockParams +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent import com.tangem.features.send.common.CommonSendRoute import com.tangem.features.send.common.ui.state.ConfirmUM import com.tangem.features.send.send.confirm.model.SendConfirmModel import com.tangem.features.send.send.confirm.ui.SendConfirmContent import com.tangem.features.send.send.ui.state.SendUM -import com.tangem.features.send.subcomponents.amount.SendAmountBlockComponent -import com.tangem.features.send.subcomponents.amount.SendAmountComponentParams +import com.tangem.features.send.subcomponents.amount.DefaultSendAmountBlockComponent +import com.tangem.features.send.api.subcomponents.amount.SendAmountComponentParams import com.tangem.features.send.subcomponents.destination.DefaultSendDestinationBlockComponent import com.tangem.features.send.subcomponents.notifications.DefaultSendNotificationsComponent import com.tangem.utils.extensions.orZero @@ -61,7 +60,7 @@ internal class SendConfirmComponent( onClick = model::showEditDestination, ) - private val amountBlockComponent = SendAmountBlockComponent( + private val amountBlockComponent = DefaultSendAmountBlockComponent( appComponentContext = child("sendConfirmAmountBlock"), params = SendAmountComponentParams.AmountBlockParams( state = model.uiState.value.amountUM, @@ -107,7 +106,7 @@ internal class SendConfirmComponent( cryptoCurrencyStatus = params.cryptoCurrencyStatus, appCurrency = params.appCurrency, callback = model, - notificationData = NotificationData( + notificationData = SendNotificationsComponent.Params.NotificationData( destinationAddress = model.confirmData.enteredDestination.orEmpty(), memo = model.confirmData.enteredMemo, amountValue = model.confirmData.enteredAmount.orZero(), diff --git a/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/model/ConfirmData.kt b/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/model/ConfirmData.kt index 96f1544055..1d28efbbdd 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/model/ConfirmData.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/model/ConfirmData.kt @@ -1,9 +1,11 @@ package com.tangem.features.send.send.confirm.model +import androidx.compose.runtime.Immutable import com.tangem.blockchain.common.transaction.Fee import com.tangem.domain.transaction.error.GetFeeError import java.math.BigDecimal +@Immutable data class ConfirmData( val enteredAmount: BigDecimal?, val reduceAmountBy: BigDecimal, diff --git a/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/model/SendConfirmModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/model/SendConfirmModel.kt index 90b2c60464..bf529097bc 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/model/SendConfirmModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/model/SendConfirmModel.kt @@ -43,24 +43,26 @@ import com.tangem.domain.transaction.usecase.SendTransactionUseCase import com.tangem.domain.transaction.usecase.gasless.CreateAndSendGaslessTransactionUseCase import com.tangem.domain.txhistory.usecase.GetExplorerTransactionUrlUseCase import com.tangem.domain.utils.convertToSdkAmount -import com.tangem.features.send.api.SendNotificationsComponent -import com.tangem.features.send.api.SendNotificationsComponent.Params.NotificationData import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents.SendScreenSource -import com.tangem.features.send.api.callbacks.FeeSelectorModelCallback -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.params.FeeSelectorParams.FeeStateConfiguration +import com.tangem.features.send.api.subcomponents.amount.SendAmountReduceTrigger import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorCheckReloadListener import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorCheckReloadTrigger import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorReloadTrigger +import com.tangem.features.send.api.subcomponents.feeSelector.callbacks.FeeSelectorModelCallback +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams.FeeStateConfiguration import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils.checkAndCalculateSubtractedAmount +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent.Params.NotificationData import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsUpdateListener import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsUpdateTrigger import com.tangem.features.send.common.CommonSendRoute import com.tangem.features.send.common.SendBalanceUpdater import com.tangem.features.send.common.SendConfirmAlertFactory import com.tangem.features.send.common.ui.state.ConfirmUM +import com.tangem.features.send.impl.R import com.tangem.features.send.send.analytics.SendAnalyticHelper import com.tangem.features.send.send.confirm.SendConfirmComponent import com.tangem.features.send.send.confirm.model.transformers.SendConfirmInitialStateTransformer @@ -68,8 +70,6 @@ import com.tangem.features.send.send.confirm.model.transformers.SendConfirmSendi import com.tangem.features.send.send.confirm.model.transformers.SendConfirmSentStateTransformer import com.tangem.features.send.send.confirm.model.transformers.SendConfirmationNotificationsTransformerV2 import com.tangem.features.send.send.ui.state.SendUM -import com.tangem.features.send.subcomponents.amount.SendAmountReduceTrigger -import com.tangem.features.send.impl.R import com.tangem.utils.coroutines.CoroutineDispatcherProvider import com.tangem.utils.extensions.orZero import com.tangem.utils.extensions.stripZeroPlainString @@ -79,7 +79,7 @@ import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch import java.math.BigDecimal import javax.inject.Inject -import com.tangem.features.send.api.entity.FeeSelectorUM as FeeSelectorUMRedesigned +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM as FeeSelectorUMRedesigned @Suppress("LongParameterList", "LargeClass") @Stable diff --git a/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/model/transformers/SendConfirmationNotificationsTransformerV2.kt b/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/model/transformers/SendConfirmationNotificationsTransformerV2.kt index 141bcab743..f6e8b1f7e8 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/model/transformers/SendConfirmationNotificationsTransformerV2.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/model/transformers/SendConfirmationNotificationsTransformerV2.kt @@ -13,7 +13,7 @@ import com.tangem.core.ui.format.bigdecimal.format import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils import com.tangem.features.send.api.utils.formatFooterFiatFee import com.tangem.features.send.api.utils.getTronTokenFeeSendingText diff --git a/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/ui/SendConfirmContent.kt b/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/ui/SendConfirmContent.kt index 2c36876bda..7da1330172 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/ui/SendConfirmContent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/ui/SendConfirmContent.kt @@ -14,11 +14,11 @@ import androidx.compose.ui.unit.dp import com.tangem.common.ui.notifications.NotificationUM import com.tangem.core.ui.components.SpacerH import com.tangem.core.ui.res.TangemTheme -import com.tangem.features.send.api.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent import com.tangem.features.send.common.ui.state.ConfirmUM import com.tangem.features.send.common.ui.tapHelp import com.tangem.features.send.send.ui.state.SendUM -import com.tangem.features.send.subcomponents.amount.SendAmountBlockComponent +import com.tangem.features.send.subcomponents.amount.DefaultSendAmountBlockComponent import com.tangem.features.send.subcomponents.destination.DefaultSendDestinationBlockComponent import com.tangem.features.send.subcomponents.notifications import com.tangem.features.send.subcomponents.notifications.DefaultSendNotificationsComponent @@ -31,7 +31,7 @@ private const val BLOCKS_KEY = "BLOCKS_KEY" internal fun SendConfirmContent( sendUM: SendUM, destinationBlockComponent: DefaultSendDestinationBlockComponent, - amountBlockComponent: SendAmountBlockComponent, + amountBlockComponent: DefaultSendAmountBlockComponent, feeSelectorBlockComponent: FeeSelectorBlockComponent, notificationsComponent: DefaultSendNotificationsComponent, notificationsUM: ImmutableList, @@ -73,7 +73,7 @@ internal fun SendConfirmContent( private fun LazyListScope.blocks( destinationBlockComponent: DefaultSendDestinationBlockComponent, - amountBlockComponent: SendAmountBlockComponent, + amountBlockComponent: DefaultSendAmountBlockComponent, feeSelectorBlockComponent: FeeSelectorBlockComponent, ) { item(key = BLOCKS_KEY) { diff --git a/features/send/impl/src/main/java/com/tangem/features/send/send/model/SendModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/send/model/SendModel.kt index 84f2df688a..643b2cfae1 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/send/model/SendModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/send/model/SendModel.kt @@ -41,16 +41,18 @@ import com.tangem.domain.transaction.usecase.GetFeeUseCase import com.tangem.domain.transaction.usecase.gasless.GetFeeForGaslessUseCase import com.tangem.domain.transaction.usecase.gasless.GetFeeForTokenUseCase import com.tangem.domain.utils.convertToSdkAmount -import com.tangem.domain.wallets.models.GetUserWalletError +import com.tangem.domain.wallets.models.errors.GetUserWalletError import com.tangem.domain.wallets.usecase.GetUserWalletUseCase import com.tangem.features.send.api.SendComponent import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents.SendScreenSource -import com.tangem.features.send.api.entity.FeeSelectorUM import com.tangem.features.send.api.entity.PredefinedValues import com.tangem.features.send.api.entity.isFromMainScreenQr +import com.tangem.features.send.api.subcomponents.amount.SendAmountComponent +import com.tangem.features.send.api.subcomponents.amount.SendAmountUpdateTrigger import com.tangem.features.send.api.subcomponents.destination.SendDestinationComponent import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.common.CommonSendRoute import com.tangem.features.send.common.SendConfirmAlertFactory import com.tangem.features.send.common.ui.state.ConfirmUM @@ -58,8 +60,6 @@ import com.tangem.features.send.send.analytics.SendAnalyticEvents import com.tangem.features.send.send.confirm.SendConfirmComponent import com.tangem.features.send.send.success.SendConfirmSuccessComponent import com.tangem.features.send.send.ui.state.SendUM -import com.tangem.features.send.subcomponents.amount.SendAmountComponent -import com.tangem.features.send.subcomponents.amount.SendAmountUpdateTrigger import com.tangem.features.send.subcomponents.destination.model.transformers.SendDestinationInitialStateTransformer import com.tangem.utils.coroutines.CoroutineDispatcherProvider import com.tangem.utils.coroutines.JobHolder diff --git a/features/send/impl/src/main/java/com/tangem/features/send/send/success/ui/SendConfirmSuccessContent.kt b/features/send/impl/src/main/java/com/tangem/features/send/send/success/ui/SendConfirmSuccessContent.kt index e0788a8bf3..598a87cf9d 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/send/success/ui/SendConfirmSuccessContent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/send/success/ui/SendConfirmSuccessContent.kt @@ -25,8 +25,8 @@ import com.tangem.core.ui.utils.toTimeFormat import com.tangem.features.send.api.subcomponents.destination.SendDestinationBlockComponent import com.tangem.features.send.common.ui.FeeBlockSuccess import com.tangem.features.send.common.ui.state.ConfirmUM -import com.tangem.features.send.send.ui.state.SendUM import com.tangem.features.send.impl.R +import com.tangem.features.send.send.ui.state.SendUM @Composable internal fun SendConfirmSuccessContent(sendUM: SendUM, destinationBlockComponent: SendDestinationBlockComponent) { diff --git a/features/send/impl/src/main/java/com/tangem/features/send/send/ui/state/SendUM.kt b/features/send/impl/src/main/java/com/tangem/features/send/send/ui/state/SendUM.kt index 4ae371cce7..0ebe64eceb 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/send/ui/state/SendUM.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/send/ui/state/SendUM.kt @@ -2,7 +2,7 @@ package com.tangem.features.send.send.ui.state import com.tangem.common.ui.amountScreen.models.AmountState import com.tangem.common.ui.navigationButtons.NavigationUM -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM import com.tangem.features.send.common.ui.state.ConfirmUM import com.tangem.features.send.send.confirm.model.ConfirmData diff --git a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/DefaultNFTSendComponent.kt b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/DefaultNFTSendComponent.kt index eb6ed71a6a..e06f11e545 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/DefaultNFTSendComponent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/DefaultNFTSendComponent.kt @@ -20,15 +20,15 @@ import com.tangem.core.ui.decompose.ComposableContentComponent import com.tangem.core.ui.extensions.resourceReference import com.tangem.features.send.api.NFTSendComponent import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents +import com.tangem.features.send.api.subcomponents.destination.SendDestinationComponent import com.tangem.features.send.api.subcomponents.destination.SendDestinationComponentParams import com.tangem.features.send.common.CommonSendRoute import com.tangem.features.send.common.ui.SendContent import com.tangem.features.send.common.ui.state.ConfirmUM +import com.tangem.features.send.impl.R import com.tangem.features.send.sendnft.confirm.NFTSendConfirmComponent import com.tangem.features.send.sendnft.model.NFTSendModel import com.tangem.features.send.sendnft.success.NFTSendSuccessComponent -import com.tangem.features.send.subcomponents.destination.DefaultSendDestinationComponent -import com.tangem.features.send.impl.R import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject @@ -41,6 +41,7 @@ internal class DefaultNFTSendComponent @AssistedInject constructor( private val nftSendConfirmComponentFactory: NFTSendConfirmComponent.Factory, private val nftSendSuccessComponentFactory: NFTSendSuccessComponent.Factory, private val analyticsEventHandler: AnalyticsEventHandler, + private val sendDestinationComponentFactory: SendDestinationComponent.Factory, ) : NFTSendComponent, AppComponentContext by appComponentContext { private val stackNavigation = StackNavigation() @@ -96,7 +97,7 @@ internal class DefaultNFTSendComponent @AssistedInject constructor( activeComponent.updateState(model.uiState.value) } } - is DefaultSendDestinationComponent -> { + is SendDestinationComponent -> { analyticsEventHandler.send( CommonSendAnalyticEvents.AddressScreenOpened( categoryName = analyticsCategoryName, @@ -131,9 +132,9 @@ internal class DefaultNFTSendComponent @AssistedInject constructor( else -> getStubComponent() } - private fun getDestinationComponent(factoryContext: AppComponentContext): DefaultSendDestinationComponent = - DefaultSendDestinationComponent( - appComponentContext = factoryContext, + private fun getDestinationComponent(factoryContext: AppComponentContext): SendDestinationComponent = + sendDestinationComponentFactory.create( + context = factoryContext, params = SendDestinationComponentParams.DestinationParams( state = model.uiState.value.destinationUM, currentRoute = model.currentRouteFlow.filterIsInstance(), diff --git a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/analytics/NFTSendAnalyticHelper.kt b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/analytics/NFTSendAnalyticHelper.kt index a98e44d9b7..b9615cf967 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/analytics/NFTSendAnalyticHelper.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/analytics/NFTSendAnalyticHelper.kt @@ -6,8 +6,8 @@ import com.tangem.core.analytics.models.Basic import com.tangem.core.decompose.di.ModelScoped import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents.Companion.NFT_SEND_CATEGORY -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationTextFieldUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM import com.tangem.features.send.sendnft.ui.state.NFTSendUM diff --git a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/NFTSendConfirmComponent.kt b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/NFTSendConfirmComponent.kt index df7d35b7b7..1093c06d6c 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/NFTSendConfirmComponent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/NFTSendConfirmComponent.kt @@ -19,12 +19,12 @@ import com.tangem.domain.models.wallet.UserWallet import com.tangem.domain.nft.models.NFTAsset import com.tangem.domain.transaction.error.GetFeeError import com.tangem.features.nft.component.NFTDetailsBlockComponent -import com.tangem.features.send.api.FeeSelectorBlockComponent -import com.tangem.features.send.api.SendNotificationsComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents import com.tangem.features.send.api.entity.PredefinedValues -import com.tangem.features.send.api.params.FeeSelectorParams -import com.tangem.features.send.api.params.FeeSelectorParams.FeeStateConfiguration +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams.FeeStateConfiguration import com.tangem.features.send.api.subcomponents.destination.SendDestinationComponentParams.DestinationBlockParams import com.tangem.features.send.common.CommonSendRoute import com.tangem.features.send.common.ui.state.ConfirmUM diff --git a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/model/NFTSendConfirmModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/model/NFTSendConfirmModel.kt index cbb6353620..cec3676b65 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/model/NFTSendConfirmModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/model/NFTSendConfirmModel.kt @@ -32,11 +32,11 @@ import com.tangem.domain.transaction.usecase.CreateNFTTransferTransactionUseCase import com.tangem.domain.transaction.usecase.SendTransactionUseCase import com.tangem.domain.txhistory.usecase.GetExplorerTransactionUrlUseCase import com.tangem.features.nft.entity.NFTSendSuccessTrigger -import com.tangem.features.send.api.SendNotificationsComponent -import com.tangem.features.send.api.SendNotificationsComponent.Params.NotificationData +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent.Params.NotificationData import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents.SendScreenSource -import com.tangem.features.send.api.callbacks.FeeSelectorModelCallback +import com.tangem.features.send.api.subcomponents.feeSelector.callbacks.FeeSelectorModelCallback import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorCheckReloadListener import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorCheckReloadTrigger @@ -62,7 +62,7 @@ import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch import java.math.BigDecimal import javax.inject.Inject -import com.tangem.features.send.api.entity.FeeSelectorUM as FeeSelectorUMRedesigned +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM as FeeSelectorUMRedesigned @Suppress("LongParameterList", "LargeClass") @ModelScoped diff --git a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/model/transformers/NFTSendConfirmationNotificationsTransformerV2.kt b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/model/transformers/NFTSendConfirmationNotificationsTransformerV2.kt index 9a209b8edf..3586fee3f0 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/model/transformers/NFTSendConfirmationNotificationsTransformerV2.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/model/transformers/NFTSendConfirmationNotificationsTransformerV2.kt @@ -9,7 +9,7 @@ import com.tangem.core.ui.extensions.wrappedList import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils import com.tangem.features.send.api.utils.formatFooterFiatFee import com.tangem.features.send.api.utils.getTronTokenFeeSendingText diff --git a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/ui/NFTSendConfirmContent.kt b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/ui/NFTSendConfirmContent.kt index 867d877dc6..be82f1c7e7 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/ui/NFTSendConfirmContent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/ui/NFTSendConfirmContent.kt @@ -13,7 +13,7 @@ import androidx.compose.ui.unit.dp import com.tangem.common.ui.notifications.NotificationUM import com.tangem.core.ui.res.TangemTheme import com.tangem.features.nft.component.NFTDetailsBlockComponent -import com.tangem.features.send.api.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent import com.tangem.features.send.common.ui.state.ConfirmUM import com.tangem.features.send.common.ui.tapHelp import com.tangem.features.send.sendnft.ui.state.NFTSendUM diff --git a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/model/NFTSendModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/model/NFTSendModel.kt index e4069a5e5e..46af42fff2 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/model/NFTSendModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/model/NFTSendModel.kt @@ -36,7 +36,7 @@ import com.tangem.domain.transaction.usecase.GetFeeUseCase import com.tangem.domain.wallets.usecase.GetUserWalletUseCase import com.tangem.features.nft.entity.NFTSendSuccessTrigger import com.tangem.features.send.api.NFTSendComponent -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.destination.SendDestinationComponent import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM import com.tangem.features.send.common.CommonSendRoute diff --git a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/ui/state/NFTSendUM.kt b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/ui/state/NFTSendUM.kt index e81c5a16b9..83701052e9 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/ui/state/NFTSendUM.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/ui/state/NFTSendUM.kt @@ -1,7 +1,7 @@ package com.tangem.features.send.sendnft.ui.state import com.tangem.common.ui.navigationButtons.NavigationUM -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM import com.tangem.features.send.common.ui.state.ConfirmUM diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/SendAmountBlockComponent.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/DefaultSendAmountBlockComponent.kt similarity index 55% rename from features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/SendAmountBlockComponent.kt rename to features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/DefaultSendAmountBlockComponent.kt index bb842f8b59..d0ee3243ac 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/SendAmountBlockComponent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/DefaultSendAmountBlockComponent.kt @@ -8,18 +8,22 @@ import com.tangem.common.ui.amountScreen.models.AmountState import com.tangem.common.ui.amountScreen.ui.AmountBlockV2 import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.decompose.model.getOrCreateModel -import com.tangem.core.ui.decompose.ComposableContentComponent import com.tangem.features.send.api.entity.PredefinedValues +import com.tangem.features.send.api.subcomponents.amount.SendAmountBlockComponent +import com.tangem.features.send.api.subcomponents.amount.SendAmountComponentParams import com.tangem.features.send.subcomponents.amount.model.SendAmountModel +import dagger.assisted.Assisted +import dagger.assisted.AssistedFactory +import dagger.assisted.AssistedInject import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach -internal class SendAmountBlockComponent( - appComponentContext: AppComponentContext, - private val params: SendAmountComponentParams.AmountBlockParams, - val onResult: (AmountState) -> Unit, - val onClick: () -> Unit, -) : ComposableContentComponent, AppComponentContext by appComponentContext { +internal class DefaultSendAmountBlockComponent @AssistedInject constructor( + @Assisted appComponentContext: AppComponentContext, + @Assisted private val params: SendAmountComponentParams.AmountBlockParams, + @Assisted val onResult: (AmountState) -> Unit, + @Assisted val onClick: () -> Unit, +) : SendAmountBlockComponent, AppComponentContext by appComponentContext { private val model: SendAmountModel = getOrCreateModel(params = params) @@ -29,7 +33,7 @@ internal class SendAmountBlockComponent( }.launchIn(componentScope) } - fun updateState(amountUM: AmountState) = model.updateState(amountUM) + override fun updateState(amountUM: AmountState) = model.updateState(amountUM) @Composable override fun Content(modifier: Modifier) { @@ -44,4 +48,14 @@ internal class SendAmountBlockComponent( modifier = modifier, ) } + + @AssistedFactory + interface Factory : SendAmountBlockComponent.Factory { + override fun create( + context: AppComponentContext, + params: SendAmountComponentParams.AmountBlockParams, + onClick: () -> Unit, + onResult: (AmountState) -> Unit, + ): DefaultSendAmountBlockComponent + } } \ No newline at end of file diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/SendAmountComponent.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/DefaultSendAmountComponent.kt similarity index 55% rename from features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/SendAmountComponent.kt rename to features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/DefaultSendAmountComponent.kt index b86140b9db..0732ec6492 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/SendAmountComponent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/DefaultSendAmountComponent.kt @@ -5,22 +5,24 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.tangem.common.ui.amountScreen.models.AmountState -import com.tangem.common.ui.navigationButtons.NavigationModelCallback import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.decompose.model.getOrCreateModel -import com.tangem.core.ui.decompose.ComposableContentComponent -import com.tangem.domain.wallets.models.GetUserWalletError +import com.tangem.features.send.api.subcomponents.amount.SendAmountComponent +import com.tangem.features.send.api.subcomponents.amount.SendAmountComponentParams import com.tangem.features.send.subcomponents.amount.model.SendAmountModel import com.tangem.features.send.subcomponents.amount.ui.SendAmountContent +import dagger.assisted.Assisted +import dagger.assisted.AssistedFactory +import dagger.assisted.AssistedInject -internal class SendAmountComponent( - appComponentContext: AppComponentContext, - private val params: SendAmountComponentParams.AmountParams, -) : ComposableContentComponent, AppComponentContext by appComponentContext { +internal class DefaultSendAmountComponent @AssistedInject constructor( + @Assisted appComponentContext: AppComponentContext, + @Assisted private val params: SendAmountComponentParams.AmountParams, +) : SendAmountComponent, AppComponentContext by appComponentContext { private val model: SendAmountModel = getOrCreateModel(params = params) - fun updateState(amountUM: AmountState) = model.updateState(amountUM) + override fun updateState(amountUM: AmountState) = model.updateState(amountUM) @Composable override fun Content(modifier: Modifier) { @@ -35,10 +37,11 @@ internal class SendAmountComponent( ) } - interface ModelCallback : NavigationModelCallback { - fun onAmountResult(amountUM: AmountState, isResetPredefined: Boolean) - fun onConvertToAnotherToken(lastAmount: String, isEnterInFiatSelected: Boolean) - fun resetSendNavigation() - fun onError(error: GetUserWalletError) + @AssistedFactory + interface Factory : SendAmountComponent.Factory { + override fun create( + context: AppComponentContext, + params: SendAmountComponentParams.AmountParams, + ): DefaultSendAmountComponent } } \ No newline at end of file diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/SendAmountReduceTrigger.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/DefaultSendAmountReduceTrigger.kt similarity index 55% rename from features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/SendAmountReduceTrigger.kt rename to features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/DefaultSendAmountReduceTrigger.kt index fab7f0ba43..48aea6c92e 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/SendAmountReduceTrigger.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/DefaultSendAmountReduceTrigger.kt @@ -1,46 +1,15 @@ package com.tangem.features.send.subcomponents.amount import com.tangem.common.ui.amountScreen.converters.AmountReduceByTransformer.ReduceByData -import kotlinx.coroutines.flow.Flow +import com.tangem.features.send.api.subcomponents.amount.SendAmountReduceListener +import com.tangem.features.send.api.subcomponents.amount.SendAmountReduceTrigger +import com.tangem.features.send.api.subcomponents.amount.SendAmountUpdateListener +import com.tangem.features.send.api.subcomponents.amount.SendAmountUpdateTrigger import kotlinx.coroutines.flow.MutableSharedFlow import java.math.BigDecimal import javax.inject.Inject import javax.inject.Singleton -/** - * Trigger for reducing amount from another component - */ -interface SendAmountReduceTrigger { - suspend fun triggerReduceBy(reduceBy: ReduceByData) - suspend fun triggerReduceTo(reduceTo: BigDecimal) - suspend fun triggerIgnoreReduce() -} - -/** - * Trigger for reducing amount from another component - */ -interface SendAmountReduceListener { - val reduceToTriggerFlow: Flow - val reduceByTriggerFlow: Flow - val ignoreReduceTriggerFlow: Flow -} - -/** - * Trigger amount change from another component. - * Different from another triggers because it takes raw string instead of BigDecimal - */ -interface SendAmountUpdateTrigger { - suspend fun triggerUpdateAmount(amountValue: String, isEnterInFiatSelected: Boolean?) -} - -/** - * Trigger amount change from another component. - * Different from another triggers because it takes raw string instead of BigDecimal - */ -interface SendAmountUpdateListener { - val updateAmountTriggerFlow: Flow> -} - @Singleton internal class DefaultSendAmountReduceTrigger @Inject constructor() : SendAmountReduceTrigger, diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/di/SendAmountModule.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/di/SendAmountModule.kt index 644c391e76..6b99065e38 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/di/SendAmountModule.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/di/SendAmountModule.kt @@ -1,10 +1,9 @@ package com.tangem.features.send.subcomponents.amount.di +import com.tangem.features.send.api.subcomponents.amount.* +import com.tangem.features.send.subcomponents.amount.DefaultSendAmountBlockComponent +import com.tangem.features.send.subcomponents.amount.DefaultSendAmountComponent import com.tangem.features.send.subcomponents.amount.DefaultSendAmountReduceTrigger -import com.tangem.features.send.subcomponents.amount.SendAmountReduceListener -import com.tangem.features.send.subcomponents.amount.SendAmountReduceTrigger -import com.tangem.features.send.subcomponents.amount.SendAmountUpdateListener -import com.tangem.features.send.subcomponents.amount.SendAmountUpdateTrigger import dagger.Binds import dagger.Module import dagger.hilt.InstallIn @@ -15,6 +14,16 @@ import javax.inject.Singleton @Module internal interface SendAmountModule { + @Singleton + @Binds + fun provideSendAmountComponentFactory(impl: DefaultSendAmountComponent.Factory): SendAmountComponent.Factory + + @Singleton + @Binds + fun provideSendAmountBlockComponentFactory( + impl: DefaultSendAmountBlockComponent.Factory, + ): SendAmountBlockComponent.Factory + @Singleton @Binds fun provideSendAmountReduceTrigger(impl: DefaultSendAmountReduceTrigger): SendAmountReduceTrigger diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/model/SendAmountModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/model/SendAmountModel.kt index bd11a2fc81..0b2b8231da 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/model/SendAmountModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/amount/model/SendAmountModel.kt @@ -9,13 +9,13 @@ import com.tangem.common.ui.amountScreen.converters.field.AmountFieldSetMaxAmoun import com.tangem.common.ui.amountScreen.models.AmountParameters import com.tangem.common.ui.amountScreen.models.AmountState import com.tangem.common.ui.amountScreen.models.EnterAmountBoundary +import com.tangem.common.ui.components.currency.icon.converter.CryptoCurrencyToIconStateConverter import com.tangem.common.ui.navigationButtons.NavigationButton import com.tangem.common.ui.navigationButtons.NavigationUM import com.tangem.core.analytics.api.AnalyticsEventHandler import com.tangem.core.decompose.di.ModelScoped import com.tangem.core.decompose.model.Model import com.tangem.core.decompose.model.ParamsContainer -import com.tangem.common.ui.components.currency.icon.converter.CryptoCurrencyToIconStateConverter import com.tangem.core.ui.extensions.WrappedList import com.tangem.core.ui.extensions.resourceReference import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase @@ -29,19 +29,21 @@ import com.tangem.domain.wallets.usecase.GetUserWalletUseCase import com.tangem.domain.wallets.usecase.GetWalletsUseCase import com.tangem.features.send.api.entity.PredefinedValues import com.tangem.features.send.api.entity.isFromMainScreenQr +import com.tangem.features.send.api.subcomponents.amount.AmountRoute +import com.tangem.features.send.api.subcomponents.amount.SendAmountComponentParams +import com.tangem.features.send.api.subcomponents.amount.SendAmountReduceListener +import com.tangem.features.send.api.subcomponents.amount.SendAmountUpdateListener import com.tangem.features.send.api.subcomponents.amount.analytics.CommonSendAmountAnalyticEvents import com.tangem.features.send.api.subcomponents.amount.analytics.CommonSendAmountAnalyticEvents.SelectedCurrencyType import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorReloadTrigger import com.tangem.features.send.common.CommonSendRoute -import com.tangem.features.send.subcomponents.amount.SendAmountComponentParams -import com.tangem.features.send.subcomponents.amount.SendAmountReduceListener -import com.tangem.features.send.subcomponents.amount.SendAmountUpdateListener import com.tangem.features.send.impl.R import com.tangem.utils.coroutines.CoroutineDispatcherProvider import com.tangem.utils.extensions.orZero import com.tangem.utils.isNullOrZero import com.tangem.utils.transformer.update import kotlinx.coroutines.flow.* +import kotlinx.coroutines.launch import javax.inject.Inject import kotlin.properties.Delegates @@ -271,13 +273,17 @@ internal class SendAmountModel @Inject constructor( override fun onConvertToAnotherToken() { val amountParams = params as? SendAmountComponentParams.AmountParams ?: return - if (amountParams.currentRoute.value.isEditMode) { - sendAmountAlertFactory.showResetSendingAlert { - params.callback.resetSendNavigation() + modelScope.launch { + var isEditMode = false + amountParams.currentRoute.collect { route -> isEditMode = route.isEditMode } + if (isEditMode) { + sendAmountAlertFactory.showResetSendingAlert { + params.callback.resetSendNavigation() + confirmConvertToToken() + } + } else { confirmConvertToToken() } - } else { - confirmConvertToToken() } } @@ -361,7 +367,9 @@ internal class SendAmountModel @Inject constructor( val params = params as? SendAmountComponentParams.AmountParams ?: return combine( flow = uiState, - flow2 = params.currentRoute.filterIsInstance(), + // Filter on the public AmountRoute interface (not the internal CommonSendRoute.Amount) so an + // external host (e.g. staking) that supplies its own AmountRoute is not silently dropped here. + flow2 = params.currentRoute.filterIsInstance(), transform = { state, route -> state to route }, ).onEach { (state, route) -> setSendWithSwapAvailability() diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/DefaultSendDestinationBlockComponent.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/DefaultSendDestinationBlockComponent.kt index 90df4644fb..324a0ef93e 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/DefaultSendDestinationBlockComponent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/DefaultSendDestinationBlockComponent.kt @@ -39,12 +39,15 @@ internal class DefaultSendDestinationBlockComponent @AssistedInject constructor( override fun Content(modifier: Modifier) { val state by model.uiState.collectAsStateWithLifecycle() val isClickEnabled by params.blockClickEnableFlow.collectAsStateWithLifecycle() + val isAddContactVisible by model.showAddContact.collectAsStateWithLifecycle() DestinationBlock( destinationUM = state, isClickDisabled = !isClickEnabled, isEditingDisabled = params.predefinedValues is PredefinedValues.Content.Deeplink, onClick = onClick, + showAddContact = isAddContactVisible, + onAddContactClick = model::onAddContactClick, ) } diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/DefaultSendDestinationComponent.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/DefaultSendDestinationComponent.kt index d798a85168..c6afc17f98 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/DefaultSendDestinationComponent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/DefaultSendDestinationComponent.kt @@ -4,8 +4,16 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.arkivanov.decompose.extensions.compose.subscribeAsState +import com.arkivanov.decompose.router.slot.childSlot +import com.arkivanov.decompose.router.slot.dismiss import com.tangem.core.decompose.context.AppComponentContext +import com.tangem.core.decompose.context.child +import com.tangem.core.decompose.context.childByContext import com.tangem.core.decompose.model.getOrCreateModel +import com.tangem.features.addressbook.AddressBookContactsBlockComponent +import com.tangem.features.addressbook.AddressBookFeatureToggles +import com.tangem.features.addressbook.AddressSelectorComponent import com.tangem.features.send.api.subcomponents.destination.SendDestinationComponent import com.tangem.features.send.api.subcomponents.destination.SendDestinationComponentParams import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM @@ -18,18 +26,62 @@ import dagger.assisted.AssistedInject internal class DefaultSendDestinationComponent @AssistedInject constructor( @Assisted appComponentContext: AppComponentContext, @Assisted private val params: SendDestinationComponentParams.DestinationParams, + addressBookFeatureToggles: AddressBookFeatureToggles, + contactsBlockFactory: AddressBookContactsBlockComponent.Factory, + addressSelectorFactory: AddressSelectorComponent.Factory, ) : SendDestinationComponent, AppComponentContext by appComponentContext { private val model: SendDestinationModel = getOrCreateModel(params = params) + private val contactsBlock: AddressBookContactsBlockComponent? by lazy { + if (addressBookFeatureToggles.isAddressBookEnabled) { + contactsBlockFactory.create( + context = child("send_contacts_block"), + params = AddressBookContactsBlockComponent.Params( + userWalletId = params.userWalletId, + network = params.cryptoCurrency.network, + queryFlow = model.addressQuery, + onContactClick = model::onContactClick, + onSeeAllClick = model::onSeeAllContactsClick, + ), + ) + } else { + null + } + } + + private val addressSelectorSlot = childSlot( + source = model.addressSelectorNavigation, + serializer = null, + key = "send_address_selector_slot", + handleBackButton = true, + childFactory = { contact, componentContext -> + addressSelectorFactory.create( + context = childByContext(componentContext), + params = AddressSelectorComponent.Params( + contact = contact, + onAddressSelected = model::applySelectedContact, + onDismiss = { model.addressSelectorNavigation.dismiss() }, + ), + ) + }, + ) + override fun updateState(destinationUM: DestinationUM) = model.updateState(destinationUM) @Composable override fun Content(modifier: Modifier) { val state by model.uiState.collectAsStateWithLifecycle() val isBalanceHidden by params.isBalanceHidingFlow.collectAsStateWithLifecycle() + val selector by addressSelectorSlot.subscribeAsState() - SendDestinationContent(state = state, clickIntents = model, isBalanceHidden = isBalanceHidden) + SendDestinationContent( + state = state, + clickIntents = model, + isBalanceHidden = isBalanceHidden, + contactsBlock = contactsBlock, + ) + selector.child?.instance?.BottomSheet() } @AssistedFactory diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/analytics/EnterAddressSource.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/analytics/EnterAddressSource.kt index 911f500009..54c9e5e288 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/analytics/EnterAddressSource.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/analytics/EnterAddressSource.kt @@ -6,11 +6,12 @@ internal enum class EnterAddressSource { RecentAddress, InputField, MyWallets, + Contact, ; val isPasted: Boolean get() = this != InputField val isAutoNext: Boolean - get() = this == RecentAddress || this == MyWallets + get() = this == RecentAddress || this == MyWallets || this == Contact } \ No newline at end of file diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/model/SendDestinationModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/model/SendDestinationModel.kt index 2a14399fd0..d493255dca 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/model/SendDestinationModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/model/SendDestinationModel.kt @@ -3,7 +3,11 @@ package com.tangem.features.send.subcomponents.destination.model import androidx.compose.runtime.Stable import arrow.core.getOrElse import arrow.core.left +import com.arkivanov.decompose.router.slot.SlotNavigation +import com.arkivanov.decompose.router.slot.activate +import com.arkivanov.decompose.router.slot.dismiss import com.tangem.common.routing.AppRoute +import com.tangem.common.routing.entity.AddressBookOpenMode import com.tangem.common.ui.navigationButtons.NavigationButton import com.tangem.common.ui.navigationButtons.NavigationUM import com.tangem.core.analytics.api.AnalyticsEventHandler @@ -15,6 +19,8 @@ import com.tangem.core.ui.extensions.resourceReference import com.tangem.domain.account.status.supplier.MultiAccountStatusListSupplier import com.tangem.domain.account.status.usecase.GetBackupProblematicWalletForAddressUseCase import com.tangem.domain.account.status.usecase.IsAccountsModeEnabledUseCase +import com.tangem.domain.addressbook.model.Contact +import com.tangem.domain.addressbook.usecase.GetContactsUseCase import com.tangem.domain.feedback.SendBackupProblemEmailUseCase import com.tangem.domain.models.account.AccountStatus import com.tangem.domain.models.account.PaymentAccountStatusValue @@ -34,6 +40,9 @@ import com.tangem.domain.transaction.usecase.ValidateWalletAddressUseCase import com.tangem.domain.transaction.usecase.ValidateWalletMemoUseCase import com.tangem.domain.txhistory.usecase.GetFixedTxHistoryItemsUseCase import com.tangem.domain.wallets.usecase.GetWalletsUseCase +import com.tangem.features.addressbook.ContactSelectionListener +import com.tangem.features.addressbook.MatchedContact +import com.tangem.features.addressbook.SelectedContact import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents.SendScreenSource import com.tangem.features.send.api.entity.PredefinedValues @@ -41,18 +50,12 @@ import com.tangem.features.send.api.subcomponents.destination.SendDestinationCom import com.tangem.features.send.api.subcomponents.destination.SendDestinationComponentParams.DestinationBlockParams import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM import com.tangem.features.send.common.CommonSendRoute -import com.tangem.features.send.subcomponents.destination.analytics.EnterAddressSource -import com.tangem.features.send.subcomponents.destination.analytics.SendDestinationAnalyticEvents -import com.tangem.features.send.subcomponents.destination.model.transformers.SendDestinationAddressTransformer -import com.tangem.features.send.subcomponents.destination.model.transformers.SendDestinationInitialStateTransformer -import com.tangem.features.send.subcomponents.destination.model.transformers.SendDestinationMemoTransformer -import com.tangem.features.send.subcomponents.destination.model.transformers.SendDestinationPredefinedStateTransformer -import com.tangem.features.send.subcomponents.destination.model.transformers.SendDestinationRecentListTransformer -import com.tangem.features.send.subcomponents.destination.model.transformers.SendDestinationValidationResultTransformer -import com.tangem.features.send.subcomponents.destination.model.transformers.SendDestinationValidationStartedTransformer -import com.tangem.features.send.subcomponents.destination.ui.state.DestinationWalletUM import com.tangem.features.send.impl.R import com.tangem.features.send.subcomponents.destination.SendDestinationAlertFactory +import com.tangem.features.send.subcomponents.destination.analytics.EnterAddressSource +import com.tangem.features.send.subcomponents.destination.analytics.SendDestinationAnalyticEvents +import com.tangem.features.send.subcomponents.destination.model.transformers.* +import com.tangem.features.send.subcomponents.destination.ui.state.DestinationWalletUM import com.tangem.utils.coroutines.CoroutineDispatcherProvider import com.tangem.utils.coroutines.JobHolder import com.tangem.utils.coroutines.saveIn @@ -88,6 +91,8 @@ internal class SendDestinationModel @Inject constructor( private val getBackupProblematicWalletForAddressUseCase: GetBackupProblematicWalletForAddressUseCase, private val sendDestinationAlertFactory: SendDestinationAlertFactory, private val sendBackupProblemEmailUseCase: SendBackupProblemEmailUseCase, + getContactsUseCase: GetContactsUseCase, + contactSelectionListener: ContactSelectionListener, ) : Model(), SendDestinationClickIntents { private val params: SendDestinationComponentParams = paramsContainer.require() @@ -98,6 +103,36 @@ internal class SendDestinationModel @Inject constructor( private val cryptoCurrency = params.cryptoCurrency private val userWalletId = params.userWalletId + private val contacts: StateFlow> = getContactsUseCase(query = "", userWalletId = userWalletId) + .stateIn(modelScope, SharingStarted.Eagerly, emptyList()) + + val addressSelectorNavigation = SlotNavigation() + val addressQuery: StateFlow = uiState + .map { (it as? DestinationUM.Content)?.addressTextField?.value.orEmpty() } + .distinctUntilChanged() + .stateIn(modelScope, SharingStarted.Eagerly, "") + + /** + * Whether to offer saving the recipient to the address book under the recipient block. Only for the success-screen + * block ([DestinationBlockParams.isAddContactAvailable]) and only when the recipient was NOT a contact and its + * `(address, network)` pair is not already saved in the current wallet's book. + */ + val showAddContact: StateFlow = + if ((params as? DestinationBlockParams)?.isAddContactAvailable == true) { + combine(uiState, contacts) { state, contactList -> + val address = (state as? DestinationUM.Content)?.addressTextField ?: return@combine false + if (address.contactName != null) return@combine false // sent via a contact + val networkId = cryptoCurrency.network.rawId + contactList.none { contact -> + contact.addressEntries.any { + it.networkId.value == networkId && it.address.equals(address.actualAddress, ignoreCase = true) + } + } + }.stateIn(modelScope, SharingStarted.Eagerly, false) + } else { + MutableStateFlow(false) + } + // In "Send with swap" flow, these are addresses in the destination network (not the actual sender addresses). // Self-send validation must be skipped for them, so use only with params.isAllowSelfSend. private val senderAddresses = MutableStateFlow>(emptyList()) @@ -110,6 +145,61 @@ internal class SendDestinationModel @Inject constructor( configDestinationNavigation() subscribeOnQRScannerResult() initialState() + resetContactOnEdit() + contactSelectionListener.resultFlow + .onEach(::applySelectedContact) + .launchIn(modelScope) + } + + private fun resetContactOnEdit() { + val params = params as? SendDestinationComponentParams.DestinationParams ?: return + params.currentRoute + .filter { it.isEditMode } + .onEach { + val content = uiState.value as? DestinationUM.Content ?: return@onEach + if (content.addressTextField.contactName != null) { + _uiState.update(SendDestinationContactTransformer(contact = null)) + } + } + .launchIn(modelScope) + } + + fun onContactClick(contact: MatchedContact) { + val singleEntry = contact.entries.singleOrNull() + if (singleEntry != null) { + applySelectedContact(contact.toSelectedContact(singleEntry)) + } else { + addressSelectorNavigation.activate(contact) + } + } + + fun onSeeAllContactsClick() { + router.push( + AppRoute.AddressBook(AddressBookOpenMode.ContactSelection(networkId = cryptoCurrency.network.rawId)), + ) + } + + /** Opens the contact editor pre-filled with the sent address/network to save the recipient (success screen). */ + fun onAddContactClick() { + val address = (uiState.value as? DestinationUM.Content)?.addressTextField?.actualAddress ?: return + router.push( + AppRoute.AddressBook( + AddressBookOpenMode.WithContactCreation(address = address, networkId = cryptoCurrency.network.rawId), + ), + ) + } + + fun applySelectedContact(contact: SelectedContact) { + addressSelectorNavigation.dismiss() + _uiState.update(SendDestinationAddressTransformer(address = contact.address, isPasted = true)) + _uiState.update(SendDestinationContactTransformer(contactName = contact.name, contactIcon = contact.icon)) + + val isMemoSupported = (uiState.value as? DestinationUM.Content)?.memoTextField != null + val memo = contact.memo?.takeIf { isMemoSupported && it.isNotBlank() } + if (memo != null) { + _uiState.update(SendDestinationMemoTransformer(memo = memo, isPasted = true)) + } + validate(address = contact.address, memo = memo, type = EnterAddressSource.Contact) } private fun initialState() { @@ -371,6 +461,7 @@ internal class SendDestinationModel @Inject constructor( isMemoRequired = isMemoRequired, ), ) + recognizeContact(type = type, isValidAddress = addressValidationResult.isRight(), address = resolvedAddress) if (type != null) { autoNextFromRecipient( type = type, @@ -381,6 +472,21 @@ internal class SendDestinationModel @Inject constructor( }.saveIn(validationJobHolder) } + private fun recognizeContact(type: EnterAddressSource?, isValidAddress: Boolean, address: String) { + if (type == null || type == EnterAddressSource.Contact) return + val contact = if (isValidAddress) findContactByAddress(address) else null + _uiState.update(SendDestinationContactTransformer(contact)) + } + + private fun findContactByAddress(address: String): Contact? { + val networkId = cryptoCurrency.network.rawId + return contacts.value.firstOrNull { contact -> + contact.addressEntries.any { entry -> + entry.networkId.value == networkId && entry.address.equals(address, ignoreCase = true) + } + } + } + private fun autoNextFromRecipient(type: EnterAddressSource, isValidAddress: Boolean, isValidMemo: Boolean) { if (type.isAutoNext && isValidAddress && isValidMemo) { saveResult() diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/model/converter/ContactIconConverter.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/model/converter/ContactIconConverter.kt new file mode 100644 index 0000000000..7aab52ca2e --- /dev/null +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/model/converter/ContactIconConverter.kt @@ -0,0 +1,15 @@ +package com.tangem.features.send.subcomponents.destination.model.converter + +import com.tangem.common.ui.account.AccountIconUM +import com.tangem.domain.addressbook.model.Contact +import com.tangem.domain.models.account.CryptoPortfolioIcon +import com.tangem.utils.converter.Converter + +internal object ContactIconConverter : Converter { + + override fun convert(value: Contact): AccountIconUM.CryptoPortfolio = AccountIconUM.CryptoPortfolio( + value = CryptoPortfolioIcon.Icon.Letter, + color = CryptoPortfolioIcon.Color.entries.firstOrNull { it.name == value.iconColor } + ?: CryptoPortfolioIcon.Color.Azure, + ) +} \ No newline at end of file diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/model/transformers/SendDestinationContactTransformer.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/model/transformers/SendDestinationContactTransformer.kt new file mode 100644 index 0000000000..802a0a8a04 --- /dev/null +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/model/transformers/SendDestinationContactTransformer.kt @@ -0,0 +1,29 @@ +package com.tangem.features.send.subcomponents.destination.model.transformers + +import com.tangem.common.ui.account.AccountIconUM +import com.tangem.domain.addressbook.model.Contact +import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM +import com.tangem.features.send.subcomponents.destination.model.converter.ContactIconConverter +import com.tangem.utils.transformer.Transformer + +internal class SendDestinationContactTransformer( + private val contactName: String?, + private val contactIcon: AccountIconUM.CryptoPortfolio?, +) : Transformer { + + constructor(contact: Contact?) : this( + contactName = contact?.name?.value, + contactIcon = contact?.let(ContactIconConverter::convert), + ) + + override fun transform(prevState: DestinationUM): DestinationUM { + val state = prevState as? DestinationUM.Content ?: return prevState + + return state.copy( + addressTextField = state.addressTextField.copy( + contactName = contactName, + contactIcon = contactIcon, + ), + ) + } +} \ No newline at end of file diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/ui/DestinationBlock.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/ui/DestinationBlock.kt index 7897334853..12175f963f 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/ui/DestinationBlock.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/ui/DestinationBlock.kt @@ -15,17 +15,21 @@ import androidx.compose.ui.platform.testTag import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.tooling.preview.PreviewParameterProvider +import com.tangem.common.ui.account.AccountIcon +import com.tangem.core.ui.components.SecondaryButtonIconStart +import com.tangem.core.ui.components.account.AccountIconSize import com.tangem.core.ui.components.icons.identicon.IdentIcon import com.tangem.core.ui.extensions.TextReference import com.tangem.core.ui.extensions.resourceReference +import com.tangem.core.ui.extensions.stringReference import com.tangem.core.ui.extensions.stringResourceSafe import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreview import com.tangem.core.ui.test.SendConfirmScreenTestTags -import com.tangem.features.send.impl.R import com.tangem.features.send.api.subcomponents.destination.entity.DestinationRecipientListUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationTextFieldUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM +import com.tangem.features.send.impl.R import kotlinx.collections.immutable.toImmutableList @Composable @@ -34,6 +38,8 @@ internal fun DestinationBlock( isClickDisabled: Boolean, isEditingDisabled: Boolean, onClick: () -> Unit, + showAddContact: Boolean = false, + onAddContactClick: () -> Unit = {}, ) { if (destinationUM !is DestinationUM.Content) return @@ -50,6 +56,16 @@ internal fun DestinationBlock( address = destinationUM.addressTextField, memo = destinationUM.memoTextField, ) + if (showAddContact) { + SecondaryButtonIconStart( + text = stringResourceSafe(com.tangem.core.ui.R.string.address_book_add_contact), + iconResId = com.tangem.core.ui.R.drawable.ic_plus_24, + onClick = onAddContactClick, + modifier = Modifier + .fillMaxWidth() + .padding(top = TangemTheme.dimens.spacing12), + ) + } } } @@ -68,31 +84,42 @@ private fun AddressWithMemoBlock( horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing24), modifier = Modifier.padding(top = TangemTheme.dimens.spacing8), ) { + val contactName = address.contactName + val contactIcon = address.contactIcon Column(modifier = Modifier.weight(1f)) { Text( - text = address.value, + text = contactName ?: address.value, style = TangemTheme.typography.body1, color = TangemTheme.colors.text.primary1, modifier = Modifier.testTag(SendConfirmScreenTestTags.RECIPIENT_ADDRESS), ) - val blockchainAddress = address.briefBlockchainAddress - if (!blockchainAddress.isNullOrBlank()) { + val recipient = if (contactName != null) address.value else address.briefBlockchainAddress + if (!recipient.isNullOrBlank()) { Text( - text = blockchainAddress, + text = recipient, style = TangemTheme.typography.caption2, color = TangemTheme.colors.text.tertiary, modifier = Modifier.testTag(SendConfirmScreenTestTags.BLOCKCHAIN_ADDRESS), ) } } - IdentIcon( - address = address.value, - modifier = Modifier - .size(TangemTheme.dimens.size36) - .clip(RoundedCornerShape(TangemTheme.dimens.radius18)) - .background(TangemTheme.colors.background.tertiary) - .testTag(SendConfirmScreenTestTags.RECIPIENT_ADDRESS_ICON), - ) + if (contactName != null && contactIcon != null) { + AccountIcon( + name = stringReference(contactName), + icon = contactIcon, + size = AccountIconSize.Medium, + modifier = Modifier.testTag(SendConfirmScreenTestTags.RECIPIENT_ADDRESS_ICON), + ) + } else { + IdentIcon( + address = address.value, + modifier = Modifier + .size(TangemTheme.dimens.size36) + .clip(RoundedCornerShape(TangemTheme.dimens.radius18)) + .background(TangemTheme.colors.background.tertiary) + .testTag(SendConfirmScreenTestTags.RECIPIENT_ADDRESS_ICON), + ) + } } if (memo != null && memo.value.isNotBlank()) { diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/ui/SendDestinationContent.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/ui/SendDestinationContent.kt index 1c539cd97b..84f2269749 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/ui/SendDestinationContent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/destination/ui/SendDestinationContent.kt @@ -30,6 +30,7 @@ import com.tangem.core.ui.extensions.* import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.test.SendAddressScreenTestTags import com.tangem.core.ui.utils.GlobalMultipleClickPreventer +import com.tangem.features.addressbook.AddressBookContactsBlockComponent import com.tangem.features.send.api.subcomponents.destination.entity.DestinationRecipientListUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationTextFieldUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM @@ -47,6 +48,7 @@ internal fun SendDestinationContent( state: DestinationUM, clickIntents: SendDestinationClickIntents, isBalanceHidden: Boolean, + contactsBlock: AddressBookContactsBlockComponent? = null, ) { if (state !is DestinationUM.Content) return val recipients = state.recent @@ -115,6 +117,15 @@ internal fun SendDestinationContent( ) }, ) + if (contactsBlock != null && !state.isRecentHidden) { + item(key = "CONTACTS_BLOCK_KEY") { + contactsBlock.Content( + modifier = Modifier + .fillMaxWidth() + .padding(top = 20.dp), + ) + } + } item("SPACER_KEY") { SpacerH(16.dp) } diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/CustomFeeConverter.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/CustomFeeConverter.kt index 208f6c8958..a32ccd682a 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/CustomFeeConverter.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/CustomFeeConverter.kt @@ -1,7 +1,7 @@ package com.tangem.features.send.subcomponents.fee.model.converters.custom import com.tangem.blockchain.common.transaction.Fee -import com.tangem.features.send.api.entity.CustomFeeFieldUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.CustomFeeFieldUM import com.tangem.utils.converter.Converter import kotlinx.collections.immutable.ImmutableList diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/bitcoin/BitcoinCustomFeeConverter.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/bitcoin/BitcoinCustomFeeConverter.kt index b46f34254d..dff135db11 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/bitcoin/BitcoinCustomFeeConverter.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/bitcoin/BitcoinCustomFeeConverter.kt @@ -11,7 +11,7 @@ import com.tangem.core.ui.utils.parseBigDecimal import com.tangem.core.ui.utils.parseToBigDecimal import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.CustomFeeFieldUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.CustomFeeFieldUM import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils.checkExceedBalance import com.tangem.features.send.subcomponents.fee.model.converters.custom.CustomFeeConverter import com.tangem.features.send.impl.R diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/BaseEthereumCustomFeeConverter.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/BaseEthereumCustomFeeConverter.kt index ad0a9617c8..895a54208b 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/BaseEthereumCustomFeeConverter.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/BaseEthereumCustomFeeConverter.kt @@ -2,7 +2,7 @@ package com.tangem.features.send.subcomponents.fee.model.converters.custom.ether import com.tangem.blockchain.common.transaction.Fee import com.tangem.features.send.subcomponents.fee.model.converters.custom.CustomFeeConverter -import com.tangem.features.send.api.entity.CustomFeeFieldUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.CustomFeeFieldUM import kotlinx.collections.immutable.ImmutableList /** diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/EthereumCustomFeeConverter.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/EthereumCustomFeeConverter.kt index d42363bd99..87e8df9782 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/EthereumCustomFeeConverter.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/EthereumCustomFeeConverter.kt @@ -10,7 +10,7 @@ import com.tangem.core.ui.extensions.resourceReference import com.tangem.core.ui.utils.parseBigDecimal import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.CustomFeeFieldUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.CustomFeeFieldUM import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils.checkExceedBalance import com.tangem.features.send.impl.R import kotlinx.collections.immutable.ImmutableList diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/EthereumEIPCustomFeeConverter.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/EthereumEIPCustomFeeConverter.kt index 975d2712e7..65e40f67c9 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/EthereumEIPCustomFeeConverter.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/EthereumEIPCustomFeeConverter.kt @@ -11,7 +11,7 @@ import com.tangem.core.ui.utils.parseBigDecimal import com.tangem.core.ui.utils.parseToBigDecimal import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.CustomFeeFieldUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.CustomFeeFieldUM import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils.checkExceedBalance import com.tangem.features.send.subcomponents.fee.model.converters.custom.setEmpty import com.tangem.features.send.impl.R diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/EthereumLegacyCustomFeeConverter.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/EthereumLegacyCustomFeeConverter.kt index 54084639bc..2cea86bd55 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/EthereumLegacyCustomFeeConverter.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/EthereumLegacyCustomFeeConverter.kt @@ -11,7 +11,7 @@ import com.tangem.core.ui.utils.parseBigDecimal import com.tangem.core.ui.utils.parseToBigDecimal import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.CustomFeeFieldUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.CustomFeeFieldUM import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils.checkExceedBalance import com.tangem.features.send.subcomponents.fee.model.converters.custom.setEmpty import com.tangem.features.send.impl.R diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/kaspa/KaspaCustomFeeConverter.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/kaspa/KaspaCustomFeeConverter.kt index 4edb9bf359..b671ead4a3 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/kaspa/KaspaCustomFeeConverter.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/kaspa/KaspaCustomFeeConverter.kt @@ -11,7 +11,7 @@ import com.tangem.core.ui.utils.parseBigDecimal import com.tangem.core.ui.utils.parseToBigDecimal import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.CustomFeeFieldUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.CustomFeeFieldUM import com.tangem.features.send.subcomponents.fee.model.converters.custom.CustomFeeConverter import com.tangem.features.send.impl.R import kotlinx.collections.immutable.ImmutableList diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/notifications/DefaultNotificationsUpdateTrigger.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/notifications/DefaultNotificationsUpdateTrigger.kt index 4173587eba..c0738aabc6 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/notifications/DefaultNotificationsUpdateTrigger.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/notifications/DefaultNotificationsUpdateTrigger.kt @@ -1,6 +1,6 @@ package com.tangem.features.send.subcomponents.notifications -import com.tangem.features.send.api.SendNotificationsComponent.Params.NotificationData +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent.Params.NotificationData import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsUpdateListener import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsUpdateTrigger import kotlinx.coroutines.flow.MutableSharedFlow diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/notifications/DefaultSendNotificationsComponent.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/notifications/DefaultSendNotificationsComponent.kt index f20fa251a3..7e15ddef4b 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/notifications/DefaultSendNotificationsComponent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/notifications/DefaultSendNotificationsComponent.kt @@ -5,8 +5,8 @@ import androidx.compose.ui.Modifier import com.tangem.common.ui.notifications.NotificationUM import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.decompose.model.getOrCreateModel -import com.tangem.features.send.api.SendNotificationsComponent -import com.tangem.features.send.api.SendNotificationsComponent.Params +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent.Params import com.tangem.features.send.subcomponents.notifications import com.tangem.features.send.subcomponents.notifications.model.NotificationsModel import dagger.assisted.Assisted diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/notifications/model/NotificationsModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/notifications/model/NotificationsModel.kt index e831713c99..b54ae939af 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/notifications/model/NotificationsModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/notifications/model/NotificationsModel.kt @@ -35,8 +35,8 @@ import com.tangem.domain.tokens.IsAmountSubtractAvailableUseCase import com.tangem.domain.tokens.model.warnings.CryptoCurrencyCheck import com.tangem.domain.transaction.usecase.ValidateTransactionUseCase import com.tangem.domain.utils.convertToSdkAmount -import com.tangem.features.send.api.SendNotificationsComponent -import com.tangem.features.send.api.SendNotificationsComponent.Params.NotificationData +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent.Params.NotificationData import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils.checkAndCalculateSubtractedAmount import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils.checkFeeCoverage import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsUpdateListener diff --git a/features/send/impl/src/test/java/com/tangem/features/send/subcomponents/amount/model/SendAmountNavigationTest.kt b/features/send/impl/src/test/java/com/tangem/features/send/subcomponents/amount/model/SendAmountNavigationTest.kt new file mode 100644 index 0000000000..837e9d2ee3 --- /dev/null +++ b/features/send/impl/src/test/java/com/tangem/features/send/subcomponents/amount/model/SendAmountNavigationTest.kt @@ -0,0 +1,179 @@ +package com.tangem.features.send.subcomponents.amount.model + +import arrow.core.right +import com.google.common.truth.Truth.assertThat +import com.tangem.blockchain.common.Blockchain +import com.tangem.common.test.domain.token.MockCryptoCurrencyFactory +import com.tangem.common.ui.amountScreen.models.AmountState +import com.tangem.common.ui.navigationButtons.NavigationUM +import com.tangem.core.analytics.api.AnalyticsEventHandler +import com.tangem.core.decompose.model.MutableParamsContainer +import com.tangem.core.ui.extensions.resourceReference +import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase +import com.tangem.domain.appcurrency.model.AppCurrency +import com.tangem.domain.models.account.Account +import com.tangem.domain.models.currency.CryptoCurrencyStatus +import com.tangem.domain.models.wallet.UserWalletId +import com.tangem.domain.tokens.GetMinimumTransactionAmountSyncUseCase +import com.tangem.domain.wallets.usecase.GetUserWalletUseCase +import com.tangem.domain.wallets.usecase.GetWalletsUseCase +import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents +import com.tangem.features.send.api.entity.PredefinedValues +import com.tangem.features.send.api.subcomponents.amount.AmountRoute +import com.tangem.features.send.api.subcomponents.amount.SendAmountComponent +import com.tangem.features.send.api.subcomponents.amount.SendAmountComponentParams +import com.tangem.features.send.api.subcomponents.amount.SendAmountReduceListener +import com.tangem.features.send.api.subcomponents.amount.SendAmountUpdateListener +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorReloadTrigger +import com.tangem.features.send.impl.R +import com.tangem.utils.coroutines.TestingCoroutineDispatcherProvider +import io.mockk.clearMocks +import io.mockk.coEvery +import io.mockk.every +import io.mockk.mockk +import io.mockk.slot +import io.mockk.verify +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.emptyFlow +import kotlinx.coroutines.test.StandardTestDispatcher +import kotlinx.coroutines.test.TestScope +import kotlinx.coroutines.test.advanceUntilIdle +import kotlinx.coroutines.test.runTest +import org.junit.jupiter.api.AfterEach +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import java.math.BigDecimal + +/** + * Guards the route-decoupling fix: `SendAmountModel.configAmountNavigation()` filters its route flow on + * the public `AmountRoute` interface, not the `internal CommonSendRoute.Amount`. The test feeds a + * foreign `AmountRoute` (which is NOT a `CommonSendRoute.Amount`) and asserts the navigation result is + * still produced — before the fix the `combine`'s `filterIsInstance()` dropped + * it and `onNavigationResult` never fired, leaving an external host (e.g. staking) with a dead Next + * button. Also checks the `isEditMode` → back-icon / primary-button mapping is unaffected. + */ +@OptIn(ExperimentalCoroutinesApi::class) +internal class SendAmountNavigationTest { + + private val getMinimumTransactionAmountSyncUseCase: GetMinimumTransactionAmountSyncUseCase = mockk() + private val sendAmountReduceListener: SendAmountReduceListener = mockk() + private val sendAmountUpdateListener: SendAmountUpdateListener = mockk() + private val analyticsEventHandler: AnalyticsEventHandler = mockk(relaxed = true) + private val getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase = mockk() + private val feeSelectorReloadTrigger: FeeSelectorReloadTrigger = mockk(relaxed = true) + private val getUserWalletUseCase: GetUserWalletUseCase = mockk() + private val sendAmountAlertFactory: SendAmountAlertFactory = mockk(relaxed = true) + private val getWalletsUseCase: GetWalletsUseCase = mockk(relaxed = true) + + private val callback: SendAmountComponent.ModelCallback = mockk(relaxed = true) + private val cryptoCurrency = MockCryptoCurrencyFactory().createCoin(Blockchain.Ethereum) + + private var model: SendAmountModel? = null + + @BeforeEach + fun setup() { + clearMocks( + getMinimumTransactionAmountSyncUseCase, + sendAmountReduceListener, + sendAmountUpdateListener, + getSelectedAppCurrencyUseCase, + getUserWalletUseCase, + callback, + ) + // No wallet → the model stays on AmountState.Empty (the heavy AmountStateConverter path is skipped), + // which is all the navigation block needs to emit. + every { getUserWalletUseCase.invokeFlow(any()) } returns emptyFlow() + every { sendAmountReduceListener.reduceToTriggerFlow } returns emptyFlow() + every { sendAmountReduceListener.reduceByTriggerFlow } returns emptyFlow() + every { sendAmountReduceListener.ignoreReduceTriggerFlow } returns emptyFlow() + every { sendAmountUpdateListener.updateAmountTriggerFlow } returns emptyFlow() + coEvery { getSelectedAppCurrencyUseCase.invokeSync() } returns AppCurrency.Default.right() + coEvery { getMinimumTransactionAmountSyncUseCase(any(), any()) } returns BigDecimal.ZERO.right() + } + + @AfterEach + fun tearDown() { + // Cancel modelScope so the long-lived navigation/status collectors stop between tests. + model?.onDestroy() + model = null + } + + @Test + fun `GIVEN a foreign AmountRoute WHEN model created THEN navigation produced with close icon and next button`() = + runTest { + // Arrange — a route that is NOT CommonSendRoute.Amount (the impl type the model used to filter on). + val navSlot = slot() + + // Act + createModel(testScope = this, route = TestAmountRoute(isEditMode = false)) + advanceUntilIdle() + + // Assert — before the fix this never fired for a non-CommonSendRoute.Amount route. + verify(atLeast = 1) { callback.onNavigationResult(capture(navSlot)) } + val content = navSlot.captured as NavigationUM.Content + assertThat(content.backIconRes).isEqualTo(R.drawable.ic_close_24) + assertThat(content.primaryButton.textReference).isEqualTo(resourceReference(R.string.common_next)) + } + + @Test + fun `GIVEN a foreign AmountRoute in edit mode WHEN model created THEN navigation has back icon and continue button`() = + runTest { + // Arrange + val navSlot = slot() + + // Act + createModel(testScope = this, route = TestAmountRoute(isEditMode = true)) + advanceUntilIdle() + + // Assert + verify(atLeast = 1) { callback.onNavigationResult(capture(navSlot)) } + val content = navSlot.captured as NavigationUM.Content + assertThat(content.backIconRes).isEqualTo(R.drawable.ic_back_24) + assertThat(content.primaryButton.textReference).isEqualTo(resourceReference(R.string.common_continue)) + } + + private fun createModel(testScope: TestScope, route: AmountRoute): SendAmountModel { + val params = SendAmountComponentParams.AmountParams( + state = AmountState.Empty, + analyticsCategoryName = "test", + userWalletId = UserWalletId(stringValue = "0123456789"), + appCurrency = AppCurrency.Default, + predefinedValues = PredefinedValues.Empty, + cryptoCurrency = cryptoCurrency, + cryptoCurrencyStatusFlow = MutableStateFlow(mockk(relaxed = true)), + isBalanceHidingFlow = MutableStateFlow(false), + analyticsSendSource = CommonSendAnalyticEvents.CommonSendSource.Send, + accountFlow = MutableStateFlow(null), + isAccountModeFlow = MutableStateFlow(false), + callback = callback, + currentRoute = MutableStateFlow(route), + ) + return SendAmountModel( + paramsContainer = MutableParamsContainer(value = params), + dispatchers = testScope.createTestingCoroutineDispatcherProvider(), + getMinimumTransactionAmountSyncUseCase = getMinimumTransactionAmountSyncUseCase, + sendAmountReduceListener = sendAmountReduceListener, + sendAmountUpdateListener = sendAmountUpdateListener, + analyticsEventHandler = analyticsEventHandler, + getSelectedAppCurrencyUseCase = getSelectedAppCurrencyUseCase, + feeSelectorReloadTrigger = feeSelectorReloadTrigger, + getUserWalletUseCase = getUserWalletUseCase, + sendAmountAlertFactory = sendAmountAlertFactory, + getWalletsUseCase = getWalletsUseCase, + ).also { model = it } + } + + private fun TestScope.createTestingCoroutineDispatcherProvider(): TestingCoroutineDispatcherProvider { + val testDispatcher = StandardTestDispatcher(testScheduler) + return TestingCoroutineDispatcherProvider( + main = testDispatcher, + mainImmediate = testDispatcher, + io = testDispatcher, + default = testDispatcher, + single = testDispatcher, + ) + } + + private data class TestAmountRoute(override val isEditMode: Boolean) : AmountRoute +} \ No newline at end of file diff --git a/features/send/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/NFTSendConfirmationNotificationsTransformerV2Test.kt b/features/send/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/NFTSendConfirmationNotificationsTransformerV2Test.kt index 394a9dc9e1..3d27923356 100644 --- a/features/send/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/NFTSendConfirmationNotificationsTransformerV2Test.kt +++ b/features/send/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/NFTSendConfirmationNotificationsTransformerV2Test.kt @@ -10,12 +10,12 @@ import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus import com.tangem.domain.models.network.Network -import com.tangem.features.send.api.entity.CustomFeeFieldUM -import com.tangem.features.send.api.entity.FeeExtraInfo -import com.tangem.features.send.api.entity.FeeFiatRateUM -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.CustomFeeFieldUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeExtraInfo +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeFiatRateUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.common.ui.state.ConfirmUM import com.tangem.features.send.sendnft.confirm.model.transformers.NFTSendConfirmationNotificationsTransformerV2 import io.mockk.mockk @@ -381,7 +381,7 @@ class NFTSendConfirmationNotificationsTransformerV2Test { isFeeApproximate = false, isFeeConvertibleToFiat = false, isTronToken = false, - feeCryptoCurrencyStatus = cryptoCurrencyStatus + feeCryptoCurrencyStatus = cryptoCurrencyStatus, ), feeFiatRateUM = FeeFiatRateUM( rate = BigDecimal("50000"), diff --git a/features/send/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/SendConfirmationNotificationsTransformerV2Test.kt b/features/send/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/SendConfirmationNotificationsTransformerV2Test.kt index 9694974592..05cd13af6c 100644 --- a/features/send/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/SendConfirmationNotificationsTransformerV2Test.kt +++ b/features/send/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/SendConfirmationNotificationsTransformerV2Test.kt @@ -12,14 +12,13 @@ import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus import com.tangem.domain.models.network.Network -import com.tangem.features.send.api.entity.CustomFeeFieldUM -import com.tangem.features.send.api.entity.FeeExtraInfo -import com.tangem.features.send.api.entity.FeeFiatRateUM -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.CustomFeeFieldUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeExtraInfo +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeFiatRateUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.common.ui.state.ConfirmUM -import com.tangem.features.send.send.confirm.model.transformers.SendConfirmationNotificationsTransformerV2 import io.mockk.mockk import io.mockk.verify import kotlinx.collections.immutable.persistentListOf diff --git a/features/send/impl/src/test/java/com/tangem/features/send/v2/subcomponents/destination/model/transformers/SendDestinationValidationResultTransformerTest.kt b/features/send/impl/src/test/java/com/tangem/features/send/v2/subcomponents/destination/model/transformers/SendDestinationValidationResultTransformerTest.kt index cc320a1341..7c18b9b971 100644 --- a/features/send/impl/src/test/java/com/tangem/features/send/v2/subcomponents/destination/model/transformers/SendDestinationValidationResultTransformerTest.kt +++ b/features/send/impl/src/test/java/com/tangem/features/send/v2/subcomponents/destination/model/transformers/SendDestinationValidationResultTransformerTest.kt @@ -12,7 +12,6 @@ import com.tangem.domain.transaction.error.AddressValidationResult import com.tangem.domain.transaction.error.ValidateMemoError import com.tangem.features.send.api.subcomponents.destination.entity.DestinationTextFieldUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM -import com.tangem.features.send.subcomponents.destination.model.transformers.SendDestinationValidationResultTransformer import com.tangem.features.send.impl.R import kotlinx.collections.immutable.persistentListOf import org.junit.jupiter.api.Test diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/common/entity/ConfirmUM.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/common/entity/ConfirmUM.kt index f99651def0..6847325b82 100644 --- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/common/entity/ConfirmUM.kt +++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/common/entity/ConfirmUM.kt @@ -5,7 +5,7 @@ import com.tangem.common.ui.notifications.NotificationUM import com.tangem.core.ui.extensions.TextReference import com.tangem.domain.express.models.ExpressProvider import com.tangem.domain.swap.models.SwapDataModel -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM import com.tangem.features.swap.v2.impl.amount.entity.SwapAmountUM import kotlinx.collections.immutable.ImmutableList diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/SendWithSwapConfirmComponent.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/SendWithSwapConfirmComponent.kt index 424c5d9d76..5b4ab5611d 100644 --- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/SendWithSwapConfirmComponent.kt +++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/SendWithSwapConfirmComponent.kt @@ -14,11 +14,11 @@ import com.tangem.domain.models.account.Account import com.tangem.domain.models.currency.CryptoCurrencyStatus import com.tangem.domain.models.wallet.UserWallet import com.tangem.domain.swap.models.SwapDirection -import com.tangem.features.send.api.FeeSelectorBlockComponent -import com.tangem.features.send.api.SendNotificationsComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents import com.tangem.features.send.api.entity.PredefinedValues -import com.tangem.features.send.api.params.FeeSelectorParams.* +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams.* import com.tangem.features.send.api.subcomponents.destination.SendDestinationBlockComponent import com.tangem.features.send.api.subcomponents.destination.SendDestinationComponentParams import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/SendWithSwapConfirmModel.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/SendWithSwapConfirmModel.kt index d4f2c02323..7ef6c2aa13 100644 --- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/SendWithSwapConfirmModel.kt +++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/SendWithSwapConfirmModel.kt @@ -37,12 +37,12 @@ import com.tangem.domain.transaction.usecase.EstimateFeeUseCase import com.tangem.domain.transaction.usecase.gasless.EstimateFeeForGaslessTxUseCase import com.tangem.domain.transaction.usecase.gasless.EstimateFeeForTokenUseCase import com.tangem.domain.txhistory.usecase.GetExplorerTransactionUrlUseCase -import com.tangem.features.send.api.SendNotificationsComponent -import com.tangem.features.send.api.SendNotificationsComponent.Params.NotificationData +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent.Params.NotificationData import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents.SendScreenSource -import com.tangem.features.send.api.callbacks.FeeSelectorModelCallback -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.callbacks.FeeSelectorModelCallback +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorReloadTrigger import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsUpdateListener @@ -76,7 +76,7 @@ import jakarta.inject.Inject import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch import java.math.BigDecimal -import com.tangem.features.send.api.entity.FeeSelectorUM as FeeSelectorUMRedesigned +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM as FeeSelectorUMRedesigned import com.tangem.utils.transformer.update as transformerUpdate @Suppress("LongParameterList", "LargeClass") diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/transformers/SendWithSwapConfirmationNotificationsTransformer.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/transformers/SendWithSwapConfirmationNotificationsTransformer.kt index b274568ef8..c62ecc15db 100644 --- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/transformers/SendWithSwapConfirmationNotificationsTransformer.kt +++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/transformers/SendWithSwapConfirmationNotificationsTransformer.kt @@ -10,7 +10,7 @@ import com.tangem.core.ui.extensions.wrappedList import com.tangem.core.ui.format.bigdecimal.fiat import com.tangem.core.ui.format.bigdecimal.format import com.tangem.domain.swap.models.SwapDirection.Companion.withSwapDirection -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils.checkIfCustomFeeTooHigh import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils.checkIfCustomFeeTooLow import com.tangem.features.send.api.utils.formatFooterFiatFee diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/ui/SendWithSwapConfirmContent.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/ui/SendWithSwapConfirmContent.kt index 7f3cb239cf..c78d8ef0fd 100644 --- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/ui/SendWithSwapConfirmContent.kt +++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/ui/SendWithSwapConfirmContent.kt @@ -12,8 +12,8 @@ import androidx.compose.ui.unit.dp import com.tangem.common.ui.notifications.NotificationUM import com.tangem.common.ui.notifications.notifications import com.tangem.core.ui.components.SpacerH16 -import com.tangem.features.send.api.FeeSelectorBlockComponent -import com.tangem.features.send.api.SendNotificationsComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent import com.tangem.features.send.api.subcomponents.destination.SendDestinationBlockComponent import com.tangem.features.swap.v2.impl.amount.SwapAmountBlockComponent import com.tangem.features.swap.v2.impl.common.entity.ConfirmUM diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/entity/SendWithSwapUM.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/entity/SendWithSwapUM.kt index 5c9d623672..1b3c333b80 100644 --- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/entity/SendWithSwapUM.kt +++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/entity/SendWithSwapUM.kt @@ -1,7 +1,7 @@ package com.tangem.features.swap.v2.impl.sendviaswap.entity import com.tangem.common.ui.navigationButtons.NavigationUM -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM import com.tangem.features.swap.v2.impl.amount.entity.SwapAmountUM import com.tangem.features.swap.v2.impl.common.entity.ConfirmUM diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/model/SendWithSwapModel.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/model/SendWithSwapModel.kt index b8196ae1b3..671ae85c1d 100644 --- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/model/SendWithSwapModel.kt +++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/model/SendWithSwapModel.kt @@ -20,7 +20,7 @@ import com.tangem.domain.models.wallet.UserWallet import com.tangem.domain.swap.models.SwapDirection import com.tangem.domain.wallets.usecase.GetUserWalletUseCase import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.destination.SendDestinationComponent import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM import com.tangem.features.swap.v2.api.SendWithSwapComponent diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/success/ui/SendWithSwapSuccessContent.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/success/ui/SendWithSwapSuccessContent.kt index 2ecf5eeb36..bf24732fbe 100644 --- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/success/ui/SendWithSwapSuccessContent.kt +++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/success/ui/SendWithSwapSuccessContent.kt @@ -45,10 +45,10 @@ import com.tangem.domain.express.models.ExpressProviderType import com.tangem.domain.swap.models.SwapDataModel import com.tangem.domain.swap.models.SwapDataTransactionModel import com.tangem.domain.utils.convertToSdkAmount -import com.tangem.features.send.api.entity.FeeExtraInfo -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeExtraInfo +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationTextFieldUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM import com.tangem.features.swap.v2.impl.R diff --git a/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt b/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt index c72fb74d8c..83becd8f0c 100644 --- a/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt +++ b/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt @@ -24,13 +24,11 @@ import com.tangem.datasource.local.preferences.PreferencesKeys import com.tangem.datasource.local.preferences.utils.getObjectSyncOrNull import com.tangem.datasource.local.preferences.utils.storeObject import com.tangem.datasource.local.txhistory.db.dao.ExpressHistoryDao -import com.tangem.domain.exchange.RampStateManager import com.tangem.domain.express.models.ExpressOperationType import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.domain.models.wallet.UserWallet import com.tangem.domain.models.wallet.UserWalletId import com.tangem.domain.txhistory.TxHistoryFeatureToggles -import com.tangem.domain.walletmanager.WalletManagersFacade import com.tangem.feature.swap.converters.* import com.tangem.feature.swap.domain.api.SwapRepository import com.tangem.feature.swap.domain.models.ExpressDataError @@ -40,7 +38,6 @@ import com.tangem.feature.swap.domain.models.domain.* import com.tangem.utils.coroutines.CoroutineDispatcherProvider import com.tangem.utils.logging.TangemLogger import kotlinx.coroutines.async -import kotlinx.coroutines.supervisorScope import kotlinx.coroutines.withContext import java.io.IOException import java.util.UUID @@ -50,11 +47,9 @@ import com.tangem.datasource.api.express.models.request.LeastTokenInfo as Networ internal class DefaultSwapRepository( private val tangemExpressApi: TangemExpressApi, private val coroutineDispatcher: CoroutineDispatcherProvider, - private val walletManagersFacade: WalletManagersFacade, private val errorsDataConverter: ErrorsDataConverter, private val dataSignatureVerifier: DataSignatureVerifier, private val appPreferencesStore: AppPreferencesStore, - private val rampStateManager: RampStateManager, private val expressHistoryDao: ExpressHistoryDao, private val txHistoryFeatureToggles: TxHistoryFeatureToggles, moshi: Moshi, @@ -124,98 +119,6 @@ internal class DefaultSwapRepository( } } - override suspend fun getPairsOnly( - userWallet: UserWallet, - initialCurrency: LeastTokenInfo, - currencyList: List, - isIgnoreExpress: Boolean, - ): PairsWithProviders { - return withContext(coroutineDispatcher.io) { - val currenciesList = filterByAssetRequirements(userWallet, currencyList) - - if (isIgnoreExpress) { - buildLocalPairs(initialCurrency, currenciesList) - } else { - fetchExpressPairs(userWallet, initialCurrency, currenciesList) - } - } - } - - private fun buildLocalPairs( - initialCurrency: LeastTokenInfo, - currenciesList: List, - ): PairsWithProviders { - val pairs = currenciesList.map { tokenInfo -> - SwapPairLeast( - from = initialCurrency, - to = LeastTokenInfo( - contractAddress = tokenInfo.contractAddress, - network = tokenInfo.network, - ), - providers = emptyList(), - ) - } - return PairsWithProviders(pairs = pairs, allProviders = emptyList()) - } - - private suspend fun fetchExpressPairs( - userWallet: UserWallet, - initialCurrency: LeastTokenInfo, - currenciesList: List, - ): PairsWithProviders { - try { - val initial = NetworkLeastTokenInfo( - contractAddress = initialCurrency.contractAddress, - network = initialCurrency.network, - ) - - val allPairs = supervisorScope { - val pairsDeferred = async { - getPairsInternal( - userWallet = userWallet, - from = arrayListOf(initial), - to = currenciesList, - ) - } - - val reversedPairsDeferred = async { - getPairsInternal( - userWallet = userWallet, - from = currenciesList, - to = arrayListOf(initial), - ) - } - - pairsDeferred.await().getOrThrow() + reversedPairsDeferred.await().getOrThrow() - } - - return swapPairInfoConverter.convert( - SwapPairsWithProviders( - swapPair = allPairs, - providers = emptyList(), - ), - ) - } catch (exception: Exception) { - if (exception is ApiResponseError.HttpException) { - throw ExpressException(errorsDataConverter.convert(exception.errorBody.orEmpty())) - } else { - throw exception - } - } - } - - private suspend fun filterByAssetRequirements( - userWallet: UserWallet, - currencyList: List, - ): List { - return currencyList - .filter { currency -> - val requirements = walletManagersFacade.getAssetRequirements(userWallet.walletId, currency) - rampStateManager.checkAssetRequirements(requirements) - } - .map { currency -> leastTokenInfoConverter.convert(currency) } - } - private suspend fun getPairsInternal( userWallet: UserWallet, from: List, diff --git a/features/swap/data/src/main/java/com/tangem/feature/swap/di/SwapDataModule.kt b/features/swap/data/src/main/java/com/tangem/feature/swap/di/SwapDataModule.kt index df600ee9ad..aa018bb971 100644 --- a/features/swap/data/src/main/java/com/tangem/feature/swap/di/SwapDataModule.kt +++ b/features/swap/data/src/main/java/com/tangem/feature/swap/di/SwapDataModule.kt @@ -12,9 +12,7 @@ import com.tangem.datasource.local.config.environment.EnvironmentConfig import com.tangem.datasource.local.preferences.AppPreferencesStore import com.tangem.datasource.local.txhistory.db.dao.ExpressHistoryDao import com.tangem.domain.account.supplier.SingleAccountListSupplier -import com.tangem.domain.exchange.RampStateManager import com.tangem.domain.txhistory.TxHistoryFeatureToggles -import com.tangem.domain.walletmanager.WalletManagersFacade import com.tangem.feature.swap.DefaultSwapFeedbackRepository import com.tangem.feature.swap.DefaultSwapRepository import com.tangem.feature.swap.NoOpSwapFeedbackRepository @@ -40,23 +38,19 @@ internal class SwapDataModule { tangemExpressApi: TangemExpressApi, coroutineDispatcher: CoroutineDispatcherProvider, dataSignature: DataSignatureVerifier, - walletManagerFacade: WalletManagersFacade, errorsDataConverter: ErrorsDataConverter, @NetworkMoshi moshi: Moshi, appPreferencesStore: AppPreferencesStore, - rampStateManager: RampStateManager, expressHistoryDao: ExpressHistoryDao, txHistoryFeatureToggles: TxHistoryFeatureToggles, ): SwapRepository { return DefaultSwapRepository( tangemExpressApi = tangemExpressApi, coroutineDispatcher = coroutineDispatcher, - walletManagersFacade = walletManagerFacade, errorsDataConverter = errorsDataConverter, dataSignatureVerifier = dataSignature, moshi = moshi, appPreferencesStore = appPreferencesStore, - rampStateManager = rampStateManager, expressHistoryDao = expressHistoryDao, txHistoryFeatureToggles = txHistoryFeatureToggles, ) diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/GetAvailablePairsUseCase.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/GetAvailablePairsUseCase.kt deleted file mode 100644 index c0bfc9041f..0000000000 --- a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/GetAvailablePairsUseCase.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.tangem.feature.swap.domain - -import com.tangem.domain.models.currency.CryptoCurrency -import com.tangem.domain.models.wallet.UserWallet -import com.tangem.feature.swap.domain.api.SwapRepository -import com.tangem.feature.swap.domain.models.domain.LeastTokenInfo -import com.tangem.feature.swap.domain.models.domain.SwapPairLeast - -class GetAvailablePairsUseCase( - private val swapRepository: SwapRepository, -) { - - suspend operator fun invoke( - userWallet: UserWallet, - initialCurrency: LeastTokenInfo, - currencies: List, - ): List { - return swapRepository.getPairsOnly( - userWallet = userWallet, - initialCurrency = initialCurrency, - currencyList = currencies, - isIgnoreExpress = true, - ).pairs - } -} \ No newline at end of file diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/api/SwapRepository.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/api/SwapRepository.kt index fb7b0b78ab..6e68ce66ad 100644 --- a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/api/SwapRepository.kt +++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/api/SwapRepository.kt @@ -16,14 +16,6 @@ interface SwapRepository { currencyList: List, ): PairsWithProviders - /** Express getPairs request variant without providers request */ - suspend fun getPairsOnly( - userWallet: UserWallet, - initialCurrency: LeastTokenInfo, - currencyList: List, - isIgnoreExpress: Boolean = false, - ): PairsWithProviders - suspend fun getExchangeStatus( userWallet: UserWallet?, userWalletId: UserWalletId, diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/component/SwapFeeSelectorBlockComponent.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/component/SwapFeeSelectorBlockComponent.kt index 59a76db3af..e55fb35d6f 100644 --- a/features/swap/impl/src/main/java/com/tangem/feature/swap/component/SwapFeeSelectorBlockComponent.kt +++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/component/SwapFeeSelectorBlockComponent.kt @@ -12,10 +12,10 @@ import com.tangem.domain.models.currency.CryptoCurrencyStatus import com.tangem.domain.models.wallet.UserWalletId import com.tangem.domain.transaction.error.GetFeeError import com.tangem.domain.transaction.models.TransactionFeeExtended -import com.tangem.features.send.api.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents -import com.tangem.features.send.api.entity.FeeSelectorUM -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt index c1b113f3c2..4dd33ac7bf 100644 --- a/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt +++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt @@ -108,8 +108,8 @@ import com.tangem.features.approval.api.SelectApprovalTypeComponent import com.tangem.features.commonfeatures.api.choosetoken.ChooseTokenAnalyticsPayload import com.tangem.features.commonfeatures.api.choosetoken.ChooseTokenBridge import com.tangem.features.commonfeatures.api.choosetoken.ChooseTokenResult -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorReloadTrigger import com.tangem.features.send.impl.R import com.tangem.features.swap.SwapComponent diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt index a7fe90f04a..362c8b1bea 100644 --- a/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt +++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt @@ -50,7 +50,7 @@ import com.tangem.feature.swap.models.SwapButton.Mode import com.tangem.feature.swap.models.states.* import com.tangem.feature.swap.presentation.R import com.tangem.feature.swap.utils.formatToUIRepresentation -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.swap.SwapFeatureToggles import com.tangem.utils.Provider import com.tangem.utils.StringsSigns diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt index 85e544a3cc..109479d7be 100644 --- a/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt +++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt @@ -31,7 +31,7 @@ import com.tangem.core.ui.utils.toTimeFormat import com.tangem.feature.swap.models.SwapSuccessStateHolder import com.tangem.feature.swap.presentation.R import com.tangem.feature.swap.preview.SwapSuccessStatePreview -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.common.ui.FeeBlockSuccess @Composable diff --git a/features/swap/impl/src/test/java/com/tangem/feature/swap/model/SwapModelApprovalSelectorCallbackTest.kt b/features/swap/impl/src/test/java/com/tangem/feature/swap/model/SwapModelApprovalSelectorCallbackTest.kt index d1518baeda..2649a4b1df 100644 --- a/features/swap/impl/src/test/java/com/tangem/feature/swap/model/SwapModelApprovalSelectorCallbackTest.kt +++ b/features/swap/impl/src/test/java/com/tangem/feature/swap/model/SwapModelApprovalSelectorCallbackTest.kt @@ -3,7 +3,7 @@ package com.tangem.feature.swap.model import com.google.common.truth.Truth.assertThat import com.tangem.common.ui.bottomsheet.permission.state.ApproveType import com.tangem.feature.swap.domain.models.ui.PermissionDataState -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import io.mockk.coVerify import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest diff --git a/features/swap/impl/src/test/java/com/tangem/feature/swap/model/SwapModelHandleFeeErrorTest.kt b/features/swap/impl/src/test/java/com/tangem/feature/swap/model/SwapModelHandleFeeErrorTest.kt index 03c4242987..c80e408980 100644 --- a/features/swap/impl/src/test/java/com/tangem/feature/swap/model/SwapModelHandleFeeErrorTest.kt +++ b/features/swap/impl/src/test/java/com/tangem/feature/swap/model/SwapModelHandleFeeErrorTest.kt @@ -6,7 +6,7 @@ import com.tangem.core.analytics.models.AnalyticsEvent import com.tangem.domain.transaction.error.GetFeeError import com.tangem.feature.swap.analytics.SwapEvents import com.tangem.feature.swap.domain.models.ui.PermissionDataState -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import io.mockk.coVerify import io.mockk.verify import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/storybook/entity/StoryBookPage.kt b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/storybook/entity/StoryBookPage.kt index 1d461a65c9..b7b864b77e 100644 --- a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/storybook/entity/StoryBookPage.kt +++ b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/storybook/entity/StoryBookPage.kt @@ -9,6 +9,7 @@ import com.tangem.core.ui.ds.topbar.TangemTopBarType import com.tangem.core.ui.ds2.badge.TangemBadge import com.tangem.core.ui.ds2.button.TangemButton import com.tangem.core.ui.ds2.fade.TangemFade +import com.tangem.core.ui.ds2.glowring.TangemGlowRing import com.tangem.core.ui.ds2.loader.TangemLoaderSize import com.tangem.core.ui.ds2.row.TangemRowContentLead import com.tangem.core.ui.ds2.row.TangemRowVerticalAlignment @@ -333,6 +334,25 @@ internal data class TangemCheckmarkStory( val onEnabledToggle: () -> Unit, ) : DsStoryBookPage +internal data class TangemGlowRingStory( + val variant: TangemGlowRing.Variant, + val quality: TangemGlowRing.Quality, + val background: Background, + val isAnimated: Boolean, + val onVariantChange: (TangemGlowRing.Variant) -> Unit, + val onQualityChange: (TangemGlowRing.Quality) -> Unit, + val onBackgroundChange: (Background) -> Unit, + val onAnimatedToggle: () -> Unit, +) : DsStoryBookPage { + + /** Backdrop the glow-ring preview is rendered on top of. */ + enum class Background(val label: String) { + BgPrimary("bg.primary"), + BgSecondary("bg.secondary"), + BgInverse("bg.inverse"), + } +} + internal data class TangemBadgeV2Story( val variant: TangemBadge.Variant, val status: TangemBadge.Status, diff --git a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/storybook/page/ds/DsComponentsListScreen.kt b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/storybook/page/ds/DsComponentsListScreen.kt index 1083082fea..fc0a092152 100644 --- a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/storybook/page/ds/DsComponentsListScreen.kt +++ b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/storybook/page/ds/DsComponentsListScreen.kt @@ -20,6 +20,7 @@ import com.tangem.feature.tester.presentation.storybook.page.ds.button.tangemBut import com.tangem.feature.tester.presentation.storybook.page.ds.checkbox.tangemCheckboxV2StoryFactory import com.tangem.feature.tester.presentation.storybook.page.ds.checkmark.tangemCheckmarkStoryFactory import com.tangem.feature.tester.presentation.storybook.page.ds.fade.tangemFadeStoryFactory +import com.tangem.feature.tester.presentation.storybook.page.ds.glowring.tangemGlowRingStoryFactory import com.tangem.feature.tester.presentation.storybook.page.ds.loader.tangemLoaderStoryFactory import com.tangem.feature.tester.presentation.storybook.page.ds.row.tangemRowStoryFactory import com.tangem.feature.tester.presentation.storybook.page.ds.search.tangemSearchStoryFactory @@ -39,6 +40,7 @@ private fun buildDsStories() = listOf( DsStoryItem(title = "✨ TangemShimmer", factory = tangemShimmerStoryFactory), DsStoryItem(title = "🌫️ TangemFade", factory = tangemFadeStoryFactory), DsStoryItem(title = "🧭 TangemTopNavigation", factory = tangemTopNavigationStoryFactory), + DsStoryItem(title = "💫 TangemGlowRing", factory = tangemGlowRingStoryFactory), ) @Composable diff --git a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/storybook/page/ds/glowring/Build.kt b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/storybook/page/ds/glowring/Build.kt new file mode 100644 index 0000000000..879601eb75 --- /dev/null +++ b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/storybook/page/ds/glowring/Build.kt @@ -0,0 +1,30 @@ +package com.tangem.feature.tester.presentation.storybook.page.ds.glowring + +import com.tangem.core.ui.ds2.glowring.TangemGlowRing +import com.tangem.feature.tester.presentation.storybook.entity.TangemGlowRingStory +import com.tangem.feature.tester.presentation.storybook.viewmodel.StateUpdater +import com.tangem.feature.tester.presentation.storybook.viewmodel.storyPageFactory + +internal fun StateUpdater.build(): TangemGlowRingStory { + return TangemGlowRingStory( + variant = TangemGlowRing.Variant.Magic, + quality = TangemGlowRing.Quality.Auto, + background = TangemGlowRingStory.Background.BgPrimary, + isAnimated = true, + onVariantChange = { variant -> + updateStory { it.copy(variant = variant) } + }, + onQualityChange = { quality -> + updateStory { it.copy(quality = quality) } + }, + onBackgroundChange = { background -> + updateStory { it.copy(background = background) } + }, + onAnimatedToggle = { + updateStory { it.copy(isAnimated = !it.isAnimated) } + }, + ) +} + +internal val tangemGlowRingStoryFactory + get() = storyPageFactory(StateUpdater::build) \ No newline at end of file diff --git a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/storybook/page/ds/glowring/TangemGlowRingStory.kt b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/storybook/page/ds/glowring/TangemGlowRingStory.kt new file mode 100644 index 0000000000..6e019d42e0 --- /dev/null +++ b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/storybook/page/ds/glowring/TangemGlowRingStory.kt @@ -0,0 +1,227 @@ +@file:Suppress("MagicNumber") + +package com.tangem.feature.tester.presentation.storybook.page.ds.glowring + +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.unit.dp +import com.tangem.core.ui.ds2.glowring.TangemGlowRing +import com.tangem.core.ui.res.TangemTheme +import com.tangem.feature.tester.presentation.storybook.entity.TangemGlowRingStory +import com.tangem.feature.tester.presentation.storybook.entity.TangemGlowRingStory.Background + +@Composable +internal fun TangemGlowRingStory(state: TangemGlowRingStory, modifier: Modifier = Modifier) { + Column( + modifier = modifier + .fillMaxSize() + .background(TangemTheme.colors.background.primary) + .padding(vertical = 16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + // Preview stays pinned at the top. + ComponentPreview(state = state) + // Only the controls scroll. + Column( + modifier = Modifier.verticalScroll(rememberScrollState()), + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + VariantSelector(selected = state.variant, onSelect = state.onVariantChange) + QualitySelector(selected = state.quality, onSelect = state.onQualityChange) + BackgroundSelector(selected = state.background, onSelect = state.onBackgroundChange) + Toggles(state = state) + } + } +} + +@Composable +private fun PreviewBackground(background: Background, modifier: Modifier = Modifier) { + when (background) { + Background.BgPrimary -> Box(modifier.background(TangemTheme.colors3.bg.primary)) + Background.BgSecondary -> Box(modifier.background(TangemTheme.colors3.bg.secondary)) + Background.BgInverse -> Box(modifier.background(TangemTheme.colors3.bg.inverse)) + } +} + +@Composable +private fun ComponentPreview(state: TangemGlowRingStory) { + Box( + contentAlignment = Alignment.Center, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp) + .clip(RoundedCornerShape(16.dp)), + ) { + PreviewBackground( + background = state.background, + modifier = Modifier.matchParentSize(), + ) + Box( + contentAlignment = Alignment.Center, + modifier = Modifier + .fillMaxWidth() + .padding(vertical = 48.dp), + ) { + TangemGlowRing( + modifier = Modifier.size(width = 200.dp, height = 120.dp), + variant = state.variant, + animated = state.isAnimated, + quality = state.quality, + ) + } + } +} + +@Composable +private fun VariantSelector(selected: TangemGlowRing.Variant, onSelect: (TangemGlowRing.Variant) -> Unit) { + Section(label = "Variant") { + ChipGrid( + items = TangemGlowRing.Variant.entries, + label = { it.name }, + isSelected = { it == selected }, + onSelect = onSelect, + ) + } +} + +@Composable +private fun QualitySelector(selected: TangemGlowRing.Quality, onSelect: (TangemGlowRing.Quality) -> Unit) { + Section(label = "Quality (renderer)") { + ChipGrid( + items = TangemGlowRing.Quality.entries, + label = { it.name }, + isSelected = { it == selected }, + onSelect = onSelect, + ) + } +} + +@Composable +private fun BackgroundSelector(selected: Background, onSelect: (Background) -> Unit) { + Section(label = "Background") { + ChipGrid( + items = Background.entries, + label = { it.label }, + isSelected = { it == selected }, + onSelect = onSelect, + ) + } +} + +@Composable +private fun Toggles(state: TangemGlowRingStory) { + Section(label = "Flags") { + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp), + verticalArrangement = Arrangement.spacedBy(8.dp), + ) { + ToggleRow(label = "animated", checked = state.isAnimated, onToggle = state.onAnimatedToggle) + } + } +} + +@Composable +private fun Section(label: String, content: @Composable () -> Unit) { + Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { + Text( + modifier = Modifier.padding(horizontal = 16.dp), + text = label, + style = TangemTheme.typography.subtitle1, + color = TangemTheme.colors.text.primary1, + ) + content() + } +} + +@Composable +private fun ChipGrid(items: List, label: (T) -> String, isSelected: (T) -> Boolean, onSelect: (T) -> Unit) { + val shape = RoundedCornerShape(50) + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp) + .clip(shape) + .background(TangemTheme.colors2.surface.level2) + .border( + width = 1.dp, + color = TangemTheme.colors2.border.neutral.secondary, + shape = shape, + ) + .padding(4.dp), + horizontalArrangement = Arrangement.spacedBy(4.dp), + ) { + items.forEach { item -> + Chip( + label = label(item), + selected = isSelected(item), + onClick = { onSelect(item) }, + modifier = Modifier.weight(1f), + ) + } + } +} + +@Composable +private fun Chip(label: String, selected: Boolean, onClick: () -> Unit, modifier: Modifier = Modifier) { + val chipShape = RoundedCornerShape(50) + Box( + contentAlignment = Alignment.Center, + modifier = modifier + .clip(chipShape) + .background( + if (selected) TangemTheme.colors2.surface.level3 else TangemTheme.colors2.surface.level2, + ) + .clickable(onClick = onClick) + .padding(vertical = 8.dp, horizontal = 4.dp), + ) { + Text( + text = label, + style = TangemTheme.typography.caption2, + color = if (selected) TangemTheme.colors.text.primary1 else TangemTheme.colors.text.secondary, + ) + } +} + +@Composable +private fun ToggleRow(label: String, checked: Boolean, onToggle: () -> Unit) { + Row( + modifier = Modifier + .fillMaxWidth() + .clip(RoundedCornerShape(12.dp)) + .background(TangemTheme.colors2.surface.level2) + .clickable(onClick = onToggle) + .padding(horizontal = 12.dp, vertical = 12.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween, + ) { + Text( + text = label, + style = TangemTheme.typography.body2, + color = TangemTheme.colors.text.primary1, + ) + Text( + text = if (checked) "ON" else "OFF", + style = TangemTheme.typography.caption2, + color = if (checked) TangemTheme.colors.text.accent else TangemTheme.colors.text.secondary, + ) + } +} \ No newline at end of file diff --git a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/storybook/ui/StoryBookScreen.kt b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/storybook/ui/StoryBookScreen.kt index fb4ee3a9a7..be9720bd99 100644 --- a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/storybook/ui/StoryBookScreen.kt +++ b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/storybook/ui/StoryBookScreen.kt @@ -42,6 +42,7 @@ import com.tangem.feature.tester.presentation.storybook.page.ds.button.TangemBut import com.tangem.feature.tester.presentation.storybook.page.ds.checkbox.TangemCheckboxV2Story import com.tangem.feature.tester.presentation.storybook.page.ds.checkmark.TangemCheckmarkStory import com.tangem.feature.tester.presentation.storybook.page.ds.fade.TangemFadeStory +import com.tangem.feature.tester.presentation.storybook.page.ds.glowring.TangemGlowRingStory import com.tangem.feature.tester.presentation.storybook.page.ds.loader.TangemLoaderStory import com.tangem.feature.tester.presentation.storybook.page.ds.row.TangemRowStory import com.tangem.feature.tester.presentation.storybook.page.ds.search.TangemSearchStory @@ -96,6 +97,7 @@ internal fun StoryBookScreen(state: StoryBookUM, modifier: Modifier = Modifier) is TangemBadgeV2Story -> TangemBadgeV2Story(state = storyState) is TangemCheckboxV2Story -> TangemCheckboxV2Story(state = storyState) is TangemCheckmarkStory -> TangemCheckmarkStory(state = storyState) + is TangemGlowRingStory -> TangemGlowRingStory(state = storyState) is TangemRowStory -> TangemRowStory(state = storyState) is TangemSearchStory -> TangemSearchStory(state = storyState) is TangemShimmerStory -> TangemShimmerStory(state = storyState) diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/express/ExpressStatusFactory.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/express/ExpressStatusFactory.kt index 087e57b6d9..5f00f4eaac 100644 --- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/express/ExpressStatusFactory.kt +++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/express/ExpressStatusFactory.kt @@ -14,6 +14,7 @@ import com.tangem.domain.models.wallet.UserWallet import com.tangem.domain.tokens.model.analytics.TokenExchangeAnalyticsEvent import com.tangem.domain.tokens.model.analytics.TokenOnrampAnalyticsEvent import com.tangem.domain.tokens.model.analytics.TokenScreenAnalyticsEvent +import com.tangem.domain.txhistory.TxHistoryFeatureToggles import com.tangem.feature.swap.domain.models.domain.ExchangeStatus import com.tangem.feature.tokendetails.presentation.tokendetails.model.ExpressTransactionsClickIntents import com.tangem.feature.tokendetails.presentation.tokendetails.state.components.ExchangeStatusNotification @@ -47,6 +48,7 @@ internal class ExpressStatusFactory @AssistedInject constructor( onrampStatusFactory: OnrampStatusFactory.Factory, exchangeStatusFactory: ExchangeStatusFactory.Factory, private val swapFeatureToggles: SwapFeatureToggles, + private val txHistoryFeatureToggles: TxHistoryFeatureToggles, ) { private val exchangeStatusFactory by lazy(mode = LazyThreadSafetyMode.NONE) { @@ -106,12 +108,17 @@ internal class ExpressStatusFactory @AssistedInject constructor( if (currentTx is ExchangeUM && currentTx.activeStatus == ExchangeStatus.Finished) { updateBalance(currentTx.toCryptoCurrency) } - val expressTxsToDisplay = expressTxs.filterNot { - when (it) { - is ExpressTransactionStateUM.OnrampUM -> it.activeStatus.isHidden - else -> false - } - }.toPersistentList() + + val expressTxsToDisplay = if (txHistoryFeatureToggles.isNewTxHistoryEnabled) { + persistentListOf() + } else { + expressTxs.filterNot { + when (it) { + is ExpressTransactionStateUM.OnrampUM -> it.activeStatus.isHidden + else -> false + } + }.toPersistentList() + } return state.copy( transactions = expressTxs, transactionsToDisplay = expressTxsToDisplay, diff --git a/features/tokendetails/impl/src/test/kotlin/com/tangem/feature/tokendetails/deeplink/DefaultTokenDetailsDeepLinkHandlerTest.kt b/features/tokendetails/impl/src/test/kotlin/com/tangem/feature/tokendetails/deeplink/DefaultTokenDetailsDeepLinkHandlerTest.kt index deefc4ebdf..3301f14437 100644 --- a/features/tokendetails/impl/src/test/kotlin/com/tangem/feature/tokendetails/deeplink/DefaultTokenDetailsDeepLinkHandlerTest.kt +++ b/features/tokendetails/impl/src/test/kotlin/com/tangem/feature/tokendetails/deeplink/DefaultTokenDetailsDeepLinkHandlerTest.kt @@ -22,7 +22,7 @@ import com.tangem.domain.models.wallet.UserWalletId import com.tangem.domain.models.wallet.isLocked import com.tangem.domain.models.wallet.isMultiCurrency import com.tangem.domain.tokens.wallet.WalletBalanceFetcher -import com.tangem.domain.wallets.models.GetUserWalletError +import com.tangem.domain.wallets.models.errors.GetUserWalletError import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase import com.tangem.domain.wallets.usecase.GetUserWalletUseCase import com.tangem.domain.wallets.usecase.SelectWalletUseCase diff --git a/features/txhistory/impl/build.gradle.kts b/features/txhistory/impl/build.gradle.kts index 2e1f349d03..34f003cbab 100644 --- a/features/txhistory/impl/build.gradle.kts +++ b/features/txhistory/impl/build.gradle.kts @@ -67,6 +67,7 @@ dependencies { /* Tests */ testImplementation(projects.common.test) + testImplementation(projects.domain.onramp.models) testImplementation(deps.test.junit5) testImplementation(deps.test.mockk) testImplementation(deps.test.truth) diff --git a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/ExpressTxToTransactionItemUMConverter.kt b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/ExpressTxToTransactionItemUMConverter.kt new file mode 100644 index 0000000000..46ade74b07 --- /dev/null +++ b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/ExpressTxToTransactionItemUMConverter.kt @@ -0,0 +1,191 @@ +package com.tangem.features.txhistory.converter + +import com.tangem.core.ui.components.transactions.state.TransactionItemUM +import com.tangem.core.ui.components.transactions.state.TransactionItemUM.Content.Direction as RowDirection +import com.tangem.core.ui.components.transactions.state.TransactionItemUM.Content.Status +import com.tangem.common.ui.components.currency.icon.converter.CryptoCurrencyToIconStateConverter +import com.tangem.core.ui.components.transactions.state.TransactionItemUM.ContentSubtitle +import com.tangem.core.ui.components.transactions.state.TransactionItemUM.ContentSubtitle.Direction as SubtitleDirection +import com.tangem.core.ui.extensions.TextReference +import com.tangem.core.ui.extensions.resourceReference +import com.tangem.core.ui.extensions.wrappedList +import com.tangem.core.ui.format.bigdecimal.crypto +import com.tangem.core.ui.format.bigdecimal.format +import com.tangem.core.ui.utils.toTimeFormat +import com.tangem.domain.express.models.ExpressExchangeStatus +import com.tangem.domain.express.models.ExpressOnrampStatus +import com.tangem.domain.models.currency.CryptoCurrency +import com.tangem.domain.txhistory.model.ExpressTx +import com.tangem.features.txhistory.impl.R +import com.tangem.features.txhistory.utils.TxHistoryUiActions +import com.tangem.utils.StringsSigns +import com.tangem.utils.converter.Converter +import java.math.BigDecimal + +/** + * Maps an [ExpressTx] (swap / onramp) row directly to [TransactionItemUM.Content]. + * + * The viewed leg is [CryptoCurrency] ([currency], the token-details currency): outgoing swap shows the pay-in + * (`from`) amount with a minus, incoming swap / onramp shows the received (`to`) amount with a plus. The 26 typed + * express statuses collapse into the three [Status] buckets (those drive title/icon/amount colors in the row UI). + * + * The counterparty ticker symbol+icon come from the resolved [ExpressTransactionAsset.cryptoCurrency] (swap); + * onramp shows the real fiat code with no icon yet (fiat carries no `CryptoCurrency`). The row click opens the + * explorer. + */ +internal class ExpressTxToTransactionItemUMConverter( + private val currency: CryptoCurrency, + private val txHistoryUiActions: TxHistoryUiActions, +) : Converter { + + private val iconStateConverter = CryptoCurrencyToIconStateConverter() + + override fun convert(value: ExpressTx): TransactionItemUM = when (value) { + is ExpressTx.Swap -> swapContent(value) + is ExpressTx.Onramp -> onrampContent(value) + } + + private fun swapContent(swap: ExpressTx.Swap): TransactionItemUM.Content { + val status = swap.tx.status.toUiStatus() + val viewedAmount = if (swap.isOutgoing) swap.tx.fromAsset.amount else swap.tx.toAsset.amount + val counterparty = if (swap.isOutgoing) swap.tx.toAsset else swap.tx.fromAsset + val prefix = when { + status is Status.Failed -> "" + swap.isOutgoing -> StringsSigns.MINUS + else -> StringsSigns.PLUS + } + return buildContent( + tx = swap, + status = status, + amount = formatAmount(viewedAmount, prefix), + direction = if (swap.isOutgoing) RowDirection.OUTGOING else RowDirection.INCOMING, + iconRes = R.drawable.ic_exchange_vertical_24, + title = swapTitle(status), + subtitle = ContentSubtitle.Asset( + direction = if (swap.isOutgoing) SubtitleDirection.TO else SubtitleDirection.FROM, + symbol = counterparty.cryptoCurrency?.symbol ?: counterparty.id.networkId, + icon = counterparty.cryptoCurrency?.let(iconStateConverter::convert), + ), + // TODO: replace null to warning logic. + warning = null, + ) + } + + private fun onrampContent(onramp: ExpressTx.Onramp): TransactionItemUM.Content { + val status = onramp.tx.status.toUiStatus() + val prefix = when { + status is Status.Failed -> "" + status is Status.Confirmed -> StringsSigns.PLUS + else -> StringsSigns.TILDE_SIGN + } + return buildContent( + tx = onramp, + status = status, + amount = formatAmount(onramp.tx.toAsset.amount, prefix), + direction = RowDirection.INCOMING, + iconRes = R.drawable.ic_tangem_card_24, + title = onrampTitle(status), + subtitle = ContentSubtitle.Asset( + direction = SubtitleDirection.FROM, + symbol = onramp.tx.fromFiat.currencySymbol, + // TODO: fiat carries no OnrampCurrency, so no icon yet — render with a fiat country flag once available. + icon = null, + ), + // TODO: replace null to warning logic. + warning = null, + ) + } + + @Suppress("LongParameterList") + private fun buildContent( + tx: ExpressTx, + status: Status, + amount: String?, + direction: RowDirection, + iconRes: Int, + title: TextReference, + subtitle: ContentSubtitle, + warning: TextReference?, + ): TransactionItemUM.Content { + val explorerHash = tx.matchHash ?: tx.txId + return TransactionItemUM.Content( + txHash = explorerHash, + amount = amount, + currencySymbol = currency.symbol, + time = tx.timestampMillis.toTimeFormat(), + status = status, + direction = direction, + onClick = { txHistoryUiActions.openTxInExplorer(explorerHash) }, + iconRes = iconRes, + title = title, + subtitle = subtitle, + timestamp = tx.timestampMillis, + warning = warning, + ) + } + + private fun formatAmount(amount: BigDecimal?, prefix: String): String? = + amount?.let { prefix + it.format { crypto(symbol = "", decimals = currency.decimals) }.trim() } + + private fun swapTitle(status: Status): TextReference = when (status) { + is Status.Confirmed -> resourceReference(R.string.common_swapped) + is Status.Unconfirmed -> resourceReference(R.string.common_swapping) + is Status.Failed -> + resourceReference(R.string.common_action_failed, wrappedList(resourceReference(R.string.common_swapping))) + } + + private fun onrampTitle(status: Status): TextReference = when (status) { + is Status.Confirmed -> resourceReference(R.string.tx_history_onramp_topped_up) + is Status.Unconfirmed -> resourceReference(R.string.tx_history_onramp_top_up) + is Status.Failed -> resourceReference( + R.string.common_action_failed, + wrappedList(resourceReference(R.string.tx_history_onramp_top_up)), + ) + } +} + +// region Status mapping + +/** + * Collapses the typed swap status into a UI [Status] bucket: the single success state ([Finished][Confirmed]), + * the failure/return states ([Failed]/[TxFailed]/[Refunded]/[Expired]/[Unknown]) → Failed, everything in flight + * (incl. [Verifying] and [Paused]) → Unconfirmed. + */ +private fun ExpressExchangeStatus.toUiStatus(): Status = when (this) { + ExpressExchangeStatus.Finished -> Status.Confirmed + ExpressExchangeStatus.Failed, + ExpressExchangeStatus.TxFailed, + ExpressExchangeStatus.Refunded, + ExpressExchangeStatus.Expired, + ExpressExchangeStatus.Unknown, + -> Status.Failed + ExpressExchangeStatus.Preview, + ExpressExchangeStatus.Created, + ExpressExchangeStatus.ExchangeTxSent, + ExpressExchangeStatus.Waiting, + ExpressExchangeStatus.WaitingTxHash, + ExpressExchangeStatus.Confirming, + ExpressExchangeStatus.Exchanging, + ExpressExchangeStatus.Sending, + ExpressExchangeStatus.Verifying, + ExpressExchangeStatus.Paused, + -> Status.Unconfirmed +} + +private fun ExpressOnrampStatus.toUiStatus(): Status = when (this) { + ExpressOnrampStatus.Finished -> Status.Confirmed + ExpressOnrampStatus.Failed, + ExpressOnrampStatus.Expired, + ExpressOnrampStatus.Unknown, + -> Status.Failed + ExpressOnrampStatus.Created, + ExpressOnrampStatus.WaitingForPayment, + ExpressOnrampStatus.PaymentProcessing, + ExpressOnrampStatus.Verifying, + ExpressOnrampStatus.Paid, + ExpressOnrampStatus.Sending, + ExpressOnrampStatus.Paused, + -> Status.Unconfirmed +} + +// endregion \ No newline at end of file diff --git a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/TxHistoryInfoToTransactionItemUMConverter.kt b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/TxHistoryInfoToTransactionItemUMConverter.kt index 574f6658c0..a52b20b829 100644 --- a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/TxHistoryInfoToTransactionItemUMConverter.kt +++ b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/TxHistoryInfoToTransactionItemUMConverter.kt @@ -4,21 +4,20 @@ import com.tangem.core.ui.components.transactions.state.TransactionItemUM import com.tangem.domain.txhistory.model.ExpressTx import com.tangem.domain.txhistory.model.OnChainTx import com.tangem.domain.txhistory.model.TxHistoryInfo -import com.tangem.features.txhistory.utils.toSyntheticTxInfo import com.tangem.utils.converter.Converter /** - * Converts a merged [TxHistoryInfo] row to [TransactionItemUM], delegating to the on-chain - * [TxHistoryItemToTransactionItemUMConverter]: on-chain rows convert their `TxInfo` directly, express - * rows convert a synthesized `TxInfo` view (see [toSyntheticTxInfo]). + * Converts a merged [TxHistoryInfo] row to [TransactionItemUM]: on-chain rows convert their `TxInfo` via + * [TxHistoryItemToTransactionItemUMConverter]; express rows map directly via [ExpressTxToTransactionItemUMConverter]. */ internal class TxHistoryInfoToTransactionItemUMConverter( private val txInfoConverter: TxHistoryItemToTransactionItemUMConverter, + private val expressConverter: ExpressTxToTransactionItemUMConverter, ) : Converter { override fun convert(value: TxHistoryInfo): TransactionItemUM = when (value) { is OnChainTx -> convertOnChain(value) - is ExpressTx -> txInfoConverter.convert(value.toSyntheticTxInfo()) + is ExpressTx -> expressConverter.convert(value) } private fun convertOnChain(value: OnChainTx): TransactionItemUM = when (value) { diff --git a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/TxHistoryItemToTransactionStateConverter.kt b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/TxHistoryItemToTransactionStateConverter.kt index 0c5e2cba45..ff5603d0eb 100644 --- a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/TxHistoryItemToTransactionStateConverter.kt +++ b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/TxHistoryItemToTransactionStateConverter.kt @@ -14,10 +14,13 @@ import com.tangem.domain.models.network.TxInfo.TransactionType import com.tangem.features.txhistory.impl.R import com.tangem.features.txhistory.utils.TxHistoryUiActions import com.tangem.utils.StringsSigns +import com.tangem.utils.annotations.RemoveWithToggle import com.tangem.utils.converter.Converter import com.tangem.utils.extensions.isZero import com.tangem.utils.toBriefAddressFormat +@Deprecated("Remove with main toggle [DesignFeatureToggles.isRedesignEnabled]. Produces pre-redesign TransactionState.") +@RemoveWithToggle("APP_REDESIGN_ENABLED") internal class TxHistoryItemToTransactionStateConverter( private val currency: CryptoCurrency, private val txHistoryUiActions: TxHistoryUiActions, diff --git a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/TxInfoToTxHistoryDetailsUMConverter.kt b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/TxInfoToTxHistoryDetailsUMConverter.kt index 94be545f70..70bf982a6d 100644 --- a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/TxInfoToTxHistoryDetailsUMConverter.kt +++ b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/TxInfoToTxHistoryDetailsUMConverter.kt @@ -14,11 +14,13 @@ import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.domain.models.network.TxInfo import com.tangem.domain.models.network.TxInfo.TransactionType import com.tangem.features.txhistory.entity.TxHistoryDetailsUM +import com.tangem.features.txhistory.entity.TxHistoryDetailsUM.StatusBannerUM.Severity import com.tangem.features.txhistory.impl.R import com.tangem.utils.StringsSigns import com.tangem.utils.converter.Converter import com.tangem.utils.extensions.isZero import com.tangem.utils.toBriefAddressFormat +import kotlinx.collections.immutable.persistentListOf import org.joda.time.DateTime /** @@ -37,13 +39,18 @@ internal class TxInfoToTxHistoryDetailsUMConverter( private val iconStateConverter = CryptoCurrencyToIconStateConverter() override fun convert(value: TxInfo): TxHistoryDetailsUM = when (value.type) { - is TransactionType.Swap -> TxHistoryDetailsUM.TwoAssets(header = value.toHeaderUM()) + // TODO([REDACTED_TASK_KEY]): populate `from` / `to` legs once TxInfo exposes the swap legs (amounts, currencies, fiat). + // Until then the card falls back to the header-only placeholder (the TwoAssetsBlock UI is already wired). + is TransactionType.Swap -> TxHistoryDetailsUM.TwoAssets( + header = value.toHeaderUM(), + statusBanner = value.toStatusBannerUM(), + ) else -> TxHistoryDetailsUM.SingleAsset( header = value.toHeaderUM(), amountBlock = value.toAmountBlockUM(), counterparty = value.toCounterpartyUM(), // TODO: TxInfo has no network fee / rate yet — empty until those fields are added to TxInfo. - rows = emptyList(), + rows = persistentListOf(), ) } @@ -54,6 +61,31 @@ internal class TxInfoToTxHistoryDetailsUMConverter( subtitle = headerSubtitle(), ) + /** + * Express status plaque under the swap block. A stopgap over the three generic [TxInfo.TransactionStatus] values — + * so [Severity.Warning] (verification) is not reachable yet. + * + * [REDACTED_TODO_COMMENT] + */ + private fun TxInfo.toStatusBannerUM(): TxHistoryDetailsUM.StatusBannerUM = when (status) { + is TxInfo.TransactionStatus.Unconfirmed -> TxHistoryDetailsUM.StatusBannerUM( + severity = Severity.Info, + title = resourceReference(R.string.express_exchange_status_receiving_active), + isLoading = true, + ) + is TxInfo.TransactionStatus.Confirmed -> TxHistoryDetailsUM.StatusBannerUM( + severity = Severity.Success, + title = resourceReference(R.string.express_exchange_status_exchanged), + isLoading = false, + ) + is TxInfo.TransactionStatus.Failed -> TxHistoryDetailsUM.StatusBannerUM( + severity = Severity.Error, + title = resourceReference(R.string.express_exchange_status_failed), + subtitle = resourceReference(R.string.express_exchange_notification_failed_text), + isLoading = false, + ) + } + private fun TxInfo.toAmountBlockUM(): TxHistoryDetailsUM.AmountBlockUM = TxHistoryDetailsUM.AmountBlockUM( currencyIcon = iconStateConverter.convert(currency), amount = stringReference(signedAmount(currency)), diff --git a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/entity/TxHistoryDetailsUM.kt b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/entity/TxHistoryDetailsUM.kt index 953290ca5d..3b3464e998 100644 --- a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/entity/TxHistoryDetailsUM.kt +++ b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/entity/TxHistoryDetailsUM.kt @@ -8,6 +8,7 @@ import com.tangem.core.ui.components.currency.icon.CurrencyIconState import com.tangem.core.ui.components.transactions.state.TransactionItemUM import com.tangem.core.ui.ds.image.DeviceIconUM import com.tangem.core.ui.extensions.TextReference +import kotlinx.collections.immutable.ImmutableList /** * UI model for the in-app transaction details ("Operation") card. @@ -28,14 +29,79 @@ internal sealed interface TxHistoryDetailsUM : TangemBottomSheetConfigContent { override val header: HeaderUM, val amountBlock: AmountBlockUM, val counterparty: CounterpartyUM?, - val rows: List, + val rows: ImmutableList, ) : TxHistoryDetailsUM - /** Two-asset layout: Swap / Onramp */ + /** + * Two-asset layout: Swap / Onramp. + * + * [from] ("You sent") → [to] ("You receive") exchange block. Both are nullable: the converter can't populate the + * legs yet (`TxInfo` exposes no swap amounts/currencies/fiat), so the card falls back to a header-only placeholder + * until that data lands. [statusBanner] is the express status plaque under the block, `null` until status is known. + */ data class TwoAssets( override val header: HeaderUM, + val from: AssetUM? = null, + val to: AssetUM? = null, + val statusBanner: StatusBannerUM? = null, ) : TxHistoryDetailsUM + /** + * Express status plaque under the two-asset block. The UI animates between successive emissions. + * + * @property severity Plaque colors (background tint + text/icon color). + * @property title Status line, e.g. "Awaiting funds" / "Confirmed" / "Failed". + * @property subtitle Optional second line (e.g. the refund hint on a failed terminal). + * @property isLoading `true` → trailing rotating loader (in-progress); `false` → static [severity] glyph. + */ + data class StatusBannerUM( + val severity: Severity, + val title: TextReference, + val subtitle: TextReference? = null, + val isLoading: Boolean, + ) { + + /** Visual severity of the [StatusBannerUM] — selects the background tint and the text/icon color. */ + enum class Severity { Info, Success, Error, Warning } + } + + /** + * One side of the two-asset block: the [label] over the signed [amount], with the [currencyIcon] on the trailing + * side. [owner] `null` → plain label ("You sent"); non-null → "From"/"To" prefix plus the resolved own account / + * wallet decoration. [isFaded] renders the unsettled/failed amount (struck through, recolored to tertiary). + */ + data class AssetUM( + val label: TextReference, + val owner: AssetOwnerUM?, + val amount: TextReference, + val currencyIcon: CurrencyIconState, + val isFaded: Boolean, + ) + + /** + * Counterparty rendered inline in an [AssetUM.label] when a swap leg resolves to one of the user's own portfolios. + * Carries the [name] plus a kind-specific 16dp decoration. Only own account / own wallet are decorated here (no + * address case, unlike the single-asset [CounterpartyAvatar]). + */ + @Immutable + sealed interface AssetOwnerUM { + + val name: TextReference + + /** User's own account — the [iconResId] glyph tinted over [backgroundColor], shown **before** the [name]. */ + data class Account( + override val name: TextReference, + @DrawableRes val iconResId: Int, + val backgroundColor: Color, + ) : AssetOwnerUM + + /** User's own wallet — the wallet card [deviceIconUM], shown **after** the [name]. */ + data class Wallet( + override val name: TextReference, + val deviceIconUM: DeviceIconUM, + ) : AssetOwnerUM + } + /** * Centered amount block of the single-asset card: token avatar (with network badge), the big signed crypto * [amount] and the secondary [fiatAmount]. @@ -43,7 +109,6 @@ internal sealed interface TxHistoryDetailsUM : TangemBottomSheetConfigContent { * [isFailed] drives the failed visual state — the amount is struck through, recolored to tertiary and carries no * `+`/`−` sign (mirrors the status-driven recolor in the shared header). */ - @Immutable data class AmountBlockUM( val currencyIcon: CurrencyIconState, val amount: TextReference, @@ -55,7 +120,6 @@ internal sealed interface TxHistoryDetailsUM : TangemBottomSheetConfigContent { * A single info row of the details card: a [label] on the leading side and its [value] on the trailing side * (e.g. `Network fee` → `0.00056 ETH`, `Rate` → `1 POL ≈ 0.36 USDT`). Rendered by [TxHistoryDetailsInfoRows]. */ - @Immutable data class InfoRowUM( val label: TextReference, val value: TextReference, @@ -76,7 +140,6 @@ internal sealed interface TxHistoryDetailsUM : TangemBottomSheetConfigContent { * @property avatar Leading avatar. * @property onCopyClick Copy action; `null` hides the copy button (e.g. own-wallet has nothing to copy). */ - @Immutable data class CounterpartyUM( val label: TextReference, val title: TextReference, @@ -105,7 +168,6 @@ internal sealed interface TxHistoryDetailsUM : TangemBottomSheetConfigContent { * Shared bottom-sheet top bar. The icon glyph and [title] text come from the transaction type; [status] drives * the three visual states (in-progress / confirmed / failed) — recoloring the icon circle and the title. */ - @Immutable data class HeaderUM( @DrawableRes val iconRes: Int, val status: TransactionItemUM.Content.Status, diff --git a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/model/TxHistoryModel.kt b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/model/TxHistoryModel.kt index b64a5d10d9..9826f149c0 100644 --- a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/model/TxHistoryModel.kt +++ b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/model/TxHistoryModel.kt @@ -28,6 +28,7 @@ import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsCountUseCase import com.tangem.domain.wallets.usecase.GetWalletIconUseCase import com.tangem.domain.txhistory.TxHistoryFeatureToggles import com.tangem.features.txhistory.component.TxHistoryComponent +import com.tangem.features.txhistory.converter.ExpressTxToTransactionItemUMConverter import com.tangem.features.txhistory.converter.TxHistoryInfoToTransactionItemUMConverter import com.tangem.features.txhistory.converter.TxHistoryItemToTransactionItemUMConverter import com.tangem.features.txhistory.converter.TxHistoryItemToTransactionStateConverter @@ -39,6 +40,7 @@ import com.tangem.features.txhistory.utils.HistoryTxListManager import com.tangem.features.txhistory.utils.TxHistoryListManager import com.tangem.features.txhistory.utils.TxHistoryUiActions import com.tangem.pagination.PaginationStatus +import com.tangem.utils.annotations.RemoveWithToggle import com.tangem.utils.coroutines.CoroutineDispatcherProvider import com.tangem.utils.logging.TangemLogger import kotlinx.collections.immutable.ImmutableList @@ -100,9 +102,11 @@ internal class TxHistoryModel @Inject constructor( emptyFlow() } + @RemoveWithToggle("APP_REDESIGN_ENABLED") private val legacyTxHistoryItemConverter = TxHistoryItemToTransactionStateConverter(currency = params.currency, txHistoryUiActions = this) + @RemoveWithToggle("AND_15767_NEW_TX_HISTORY_ENABLED") private val txHistoryListManager: TxHistoryListManager? = if (!txHistoryFeatureToggle.isNewTxHistoryEnabled) { TxHistoryListManager( repository = repository, @@ -193,7 +197,6 @@ internal class TxHistoryModel @Inject constructor( } } - // Temporary: express rows are mapped to UI via a synthesized TxInfo (see ExpressTx.toSyntheticTxInfo). private fun buildUiItems( merged: List, lookup: TxHistoryLookupContext, @@ -204,6 +207,10 @@ internal class TxHistoryModel @Inject constructor( txHistoryUiActions = this, lookupContext = lookup, ), + expressConverter = ExpressTxToTransactionItemUMConverter( + currency = params.currency, + txHistoryUiActions = this, + ), ) val items = mutableListOf() diff --git a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/ui/TxHistoryDetailsContent.kt b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/ui/TxHistoryDetailsContent.kt index 168b677494..236d3ffeca 100644 --- a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/ui/TxHistoryDetailsContent.kt +++ b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/ui/TxHistoryDetailsContent.kt @@ -19,8 +19,7 @@ import com.tangem.features.txhistory.entity.TxHistoryDetailsUM internal fun TxHistoryDetailsContent(state: TxHistoryDetailsUM, modifier: Modifier = Modifier) { when (state) { is TxHistoryDetailsUM.SingleAsset -> SingleAssetContent(state = state, modifier = modifier) - // TODO([REDACTED_TASK_KEY]): two-asset (Swap / Onramp) body — out of scope for the single-asset amount block ticket. - is TxHistoryDetailsUM.TwoAssets -> TwoAssetsPlaceholder(state = state, modifier = modifier) + is TxHistoryDetailsUM.TwoAssets -> TwoAssetsContent(state = state, modifier = modifier) } } @@ -45,6 +44,35 @@ private fun SingleAssetContent(state: TxHistoryDetailsUM.SingleAsset, modifier: } } +@Composable +private fun TwoAssetsContent(state: TxHistoryDetailsUM.TwoAssets, modifier: Modifier = Modifier) { + val from = state.from + val to = state.to + Column(modifier = modifier.fillMaxWidth().padding(bottom = 16.dp)) { + if (from != null && to != null) { + TxHistoryDetailsTwoAssetsBlock( + from = from, + to = to, + modifier = Modifier + .fillMaxWidth() + .padding(start = 16.dp, end = 16.dp), + ) + } else { + // TODO([REDACTED_TASK_KEY]): the converter cannot populate the swap legs yet (TxInfo exposes no two-leg / fiat / + // provider data). Until those fields land, fall back to the header-only placeholder. + TwoAssetsPlaceholder(state = state) + } + // Express status plaque under the exchange block. The top gap is owned by the banner (inside its collapsing + // region), so only horizontal padding is applied here. + TxHistoryDetailsStatusBanner( + state = state.statusBanner, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp), + ) + } +} + @Composable private fun TwoAssetsPlaceholder(state: TxHistoryDetailsUM.TwoAssets, modifier: Modifier = Modifier) { Box( diff --git a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/ui/TxHistoryDetailsInfoRows.kt b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/ui/TxHistoryDetailsInfoRows.kt index 832800759a..9a9a742589 100644 --- a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/ui/TxHistoryDetailsInfoRows.kt +++ b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/ui/TxHistoryDetailsInfoRows.kt @@ -20,6 +20,8 @@ import com.tangem.core.ui.extensions.stringReference import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreviewRedesign import com.tangem.features.txhistory.entity.TxHistoryDetailsUM.InfoRowUM +import kotlinx.collections.immutable.ImmutableList +import kotlinx.collections.immutable.persistentListOf /** * Info-rows block of the transaction details card: a vertical list of DS3 [TangemRow]s (label on the leading side, @@ -36,7 +38,7 @@ import com.tangem.features.txhistory.entity.TxHistoryDetailsUM.InfoRowUM * @param modifier Modifier applied to the list container. */ @Composable -internal fun TxHistoryDetailsInfoRows(rows: List, modifier: Modifier = Modifier) { +internal fun TxHistoryDetailsInfoRows(rows: ImmutableList, modifier: Modifier = Modifier) { if (rows.isEmpty()) return Column( modifier = modifier, @@ -74,7 +76,7 @@ private fun TxHistoryDetailsInfoRowsPreview() { ) { // Multiple rows — dividers between rows, none after the last TxHistoryDetailsInfoRows( - rows = listOf( + rows = persistentListOf( InfoRowUM(label = stringReference("Network fee"), value = stringReference("0.00056 ETH")), InfoRowUM(label = stringReference("Rate"), value = stringReference("1 POL ≈ 0.36 USDT")), InfoRowUM(label = stringReference("Network fee"), value = stringReference("0.00056 ETH")), @@ -83,7 +85,7 @@ private fun TxHistoryDetailsInfoRowsPreview() { // Single row — no divider TxHistoryDetailsInfoRows( modifier = Modifier.padding(top = 16.dp), - rows = listOf( + rows = persistentListOf( InfoRowUM(label = stringReference("Network fee"), value = stringReference("0.00056 ETH")), ), ) diff --git a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/ui/TxHistoryDetailsModalBottomSheetContent.kt b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/ui/TxHistoryDetailsModalBottomSheetContent.kt index 62309f8e01..bf58d7e39c 100644 --- a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/ui/TxHistoryDetailsModalBottomSheetContent.kt +++ b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/ui/TxHistoryDetailsModalBottomSheetContent.kt @@ -14,6 +14,7 @@ import com.tangem.core.ui.extensions.stringReference import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreviewRedesign import com.tangem.features.txhistory.entity.TxHistoryDetailsUM +import kotlinx.collections.immutable.persistentListOf /** * The transaction details bottom sheet ("Operation"): the [TangemModalBottomSheet] shell shared by all transaction @@ -79,7 +80,7 @@ private fun previewSingleAsset() = TxHistoryDetailsUM.SingleAsset( ), onCopyClick = {}, ), - rows = listOf( + rows = persistentListOf( TxHistoryDetailsUM.InfoRowUM(label = stringReference("Network fee"), value = stringReference("0.00056 ETH")), ), ) diff --git a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/ui/TxHistoryDetailsStatusBanner.kt b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/ui/TxHistoryDetailsStatusBanner.kt new file mode 100644 index 0000000000..3c8eb60f34 --- /dev/null +++ b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/ui/TxHistoryDetailsStatusBanner.kt @@ -0,0 +1,311 @@ +package com.tangem.features.txhistory.ui + +import android.content.res.Configuration.UI_MODE_NIGHT_YES +import androidx.compose.animation.AnimatedContent +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.ContentTransform +import androidx.compose.animation.SizeTransform +import androidx.compose.animation.animateColorAsState +import androidx.compose.animation.core.snap +import androidx.compose.animation.core.tween +import androidx.compose.animation.expandVertically +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.scaleIn +import androidx.compose.animation.shrinkVertically +import androidx.compose.animation.slideInHorizontally +import androidx.compose.animation.slideInVertically +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Icon +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.SideEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import com.tangem.core.ui.ds2.loader.TangemLoader +import com.tangem.core.ui.ds2.loader.TangemLoaderSize +import com.tangem.core.ui.extensions.TextReference +import com.tangem.core.ui.extensions.resolveReference +import com.tangem.core.ui.extensions.stringReference +import com.tangem.core.ui.res.TangemTheme +import com.tangem.core.ui.res.TangemThemePreviewRedesign +import com.tangem.core.ui.res.generated.icons.Icons +import com.tangem.core.ui.res.generated.icons.ic_error_20 +import com.tangem.core.ui.res.generated.icons.ic_info_20 +import com.tangem.core.ui.res.generated.icons.ic_success_20 +import com.tangem.core.ui.res.generated.icons.ic_warning_20 +import com.tangem.features.txhistory.entity.TxHistoryDetailsUM.StatusBannerUM +import com.tangem.features.txhistory.entity.TxHistoryDetailsUM.StatusBannerUM.Severity + +// Animation timings in ms (ProtoPie spec). The status swap is two-phase: the old status fades out, then the new one +// fades/slides in after ENTER_DELAY. Most steps run over the default duration; the trailing loader/glyph fades faster +// (FAST_FADE), and the plaque grows over GROW to make room for a subtitle. +private const val DEFAULT_ANIMATION_MILLIS = 300 +private const val FAST_FADE_MILLIS = 200 +private const val GROW_MILLIS = 400 +private const val ENTER_DELAY_MILLIS = DEFAULT_ANIMATION_MILLIS // phase 2 waits for the phase-1 fade-out to clear +private const val SUBTITLE_DELAY_MILLIS = ENTER_DELAY_MILLIS + 100 // subtitle trails the title + +private const val TITLE_SLIDE_FRACTION = 12 // in-progress/Success title slides in 1/12 width from the right +private const val CONTENT_RISE_FRACTION = 2 // Warning/Error title floats up 1/2 height from below +private const val ICON_ENTER_SCALE = 0.6f + +/** Gap between the exchange block above and the plaque; kept inside the collapsing region so it folds away cleanly. */ +private val BANNER_TOP_GAP = 12.dp + +/** Gap between the title row and the subtitle; lives inside the subtitle slot so it folds away when there's no line. */ +private val SUBTITLE_TOP_GAP = 4.dp + +/** Key for the title [AnimatedContent]: the resolved [text] plus the [severity] that selects the swap motion. */ +private data class StatusBannerTitle(val text: String, val severity: Severity) + +/** + * Title transition picked by the *target* severity: Info/Success slide in from the right ([titleSlide]); Warning/Error + * float up from below ([titleRise]). Both fade the old status out fully before fading the new one in. + */ +private fun titleTransition(target: Severity): ContentTransform = when (target) { + Severity.Warning, Severity.Error -> titleRise() + Severity.Info, Severity.Success -> titleSlide() +} + +/** In-progress / success swap: old status fades out, new one fades in sliding from the right. */ +private fun titleSlide(): ContentTransform = ContentTransform( + targetContentEnter = fadeIn(tween(durationMillis = DEFAULT_ANIMATION_MILLIS, delayMillis = ENTER_DELAY_MILLIS)) + + slideInHorizontally( + animationSpec = tween(durationMillis = DEFAULT_ANIMATION_MILLIS, delayMillis = ENTER_DELAY_MILLIS), + ) { width -> width / TITLE_SLIDE_FRACTION }, + initialContentExit = fadeOut(tween(durationMillis = DEFAULT_ANIMATION_MILLIS)), + sizeTransform = SizeTransform(clip = false) { _, _ -> snap() }, +) + +/** Terminal warning / error swap: old status fades out, new one fades in floating up a touch from below. */ +private fun titleRise(): ContentTransform = ContentTransform( + targetContentEnter = fadeIn(tween(durationMillis = DEFAULT_ANIMATION_MILLIS, delayMillis = ENTER_DELAY_MILLIS)) + + slideInVertically( + animationSpec = tween(durationMillis = DEFAULT_ANIMATION_MILLIS, delayMillis = ENTER_DELAY_MILLIS), + ) { height -> height / CONTENT_RISE_FRACTION }, + initialContentExit = fadeOut(tween(durationMillis = DEFAULT_ANIMATION_MILLIS)), + sizeTransform = SizeTransform(clip = false) { _, _ -> snap() }, +) + +/** Trailing-slot swap (loader → glyph): loader fades out (Phase 1), then the glyph "pops" in (Phase 2). */ +private fun iconSwapTransition(): ContentTransform = ContentTransform( + targetContentEnter = fadeIn(tween(durationMillis = FAST_FADE_MILLIS, delayMillis = ENTER_DELAY_MILLIS)) + + scaleIn( + animationSpec = tween(durationMillis = DEFAULT_ANIMATION_MILLIS, delayMillis = ENTER_DELAY_MILLIS), + initialScale = ICON_ENTER_SCALE, + ), + initialContentExit = fadeOut(tween(durationMillis = FAST_FADE_MILLIS)), + sizeTransform = SizeTransform(clip = false) { _, _ -> snap() }, +) + +/** + * Express status plaque of the Swap / Onramp transaction details, rendered under the two-asset exchange block. + * + * [Figma](https://www.figma.com/design/Qqm0dNTOnqtxLYEcmgc32C/Store?node-id=1370-114172) + * + * Two animation layers: [AnimatedVisibility] grows the plaque in from its top edge / collapses it to the bottom; + * in-place status transitions ([StatusBannerContent]) morph the title, background tint and trailing loader→glyph as + * the model re-emits the latest [state]. + * + * @param state Current status to render, or `null` to hide the plaque (animated out). + * @param modifier Modifier applied to the plaque container. + */ +@Composable +internal fun TxHistoryDetailsStatusBanner(state: StatusBannerUM?, modifier: Modifier = Modifier) { + // Retain the last non-null state so content stays rendered through the exit (collapse+fade). The retained value + // only backfills the exit (when [state] is null); published in a SideEffect, not written during composition. + val lastState = remember { mutableStateOf(null) } + SideEffect { if (state != null) lastState.value = state } + val content = state ?: lastState.value + + AnimatedVisibility( + visible = state != null, + // Fade and size share one tween so alpha and height finish together (mismatched default springs leave a jerk). + enter = fadeIn(tween(DEFAULT_ANIMATION_MILLIS)) + + expandVertically(tween(DEFAULT_ANIMATION_MILLIS), expandFrom = Alignment.Top), + exit = fadeOut(tween(DEFAULT_ANIMATION_MILLIS)) + + shrinkVertically(tween(DEFAULT_ANIMATION_MILLIS), shrinkTowards = Alignment.Bottom), + modifier = modifier, + ) { + // Leading gap lives inside the animated region so it collapses together with the plaque (no residual margin). + content?.let { StatusBannerContent(state = it, modifier = Modifier.padding(top = BANNER_TOP_GAP)) } + } +} + +@Composable +private fun StatusBannerContent(state: StatusBannerUM, modifier: Modifier = Modifier) { + val backgroundColor by animateColorAsState( + targetValue = state.severity.backgroundColor(), + // Delayed into Phase 2, so the tint starts shifting only once the old title has faded out, matching the spec. + animationSpec = tween(durationMillis = DEFAULT_ANIMATION_MILLIS, delayMillis = ENTER_DELAY_MILLIS), + label = "StatusBannerBackground", + ) + val contentColor = state.severity.contentColor() + + Column( + modifier = modifier + .fillMaxWidth() + .clip(RoundedCornerShape(24.dp)) + .background(backgroundColor) + .padding(horizontal = 16.dp, vertical = 12.dp), + ) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(8.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + // Animate the title as the status advances. Keyed on (text, severity) so [titleTransition] picks the motion + // by target; the key also colors each content from its own severity (see [color] below). + AnimatedContent( + targetState = StatusBannerTitle(state.title.resolveReference(), state.severity), + transitionSpec = { titleTransition(target = targetState.severity) }, + label = "StatusBannerTitle", + modifier = Modifier.weight(1f), + ) { title -> + Text( + text = title.text, + style = TangemTheme.typography3.body.medium, + // From this title's own key, so the outgoing title fades out in its colour instead of snapping. + color = title.severity.contentColor(), + maxLines = 2, + overflow = TextOverflow.Ellipsis, + ) + } + StatusBannerTrailing(isLoading = state.isLoading, severity = state.severity) + } + // Retain the last non-null subtitle so the line stays rendered while it fades out (mirrors the retain above). + val lastSubtitle = remember { mutableStateOf(null) } + SideEffect { if (state.subtitle != null) lastSubtitle.value = state.subtitle } + + AnimatedVisibility( + visible = state.subtitle != null, + // The subtitle owns the plaque's growth: expandVertically opens its slot in Phase 2, then the text fades in + // a touch later so it trails the title. expandVertically (not animateContentSize) lets us delay the growth. + enter = expandVertically( + animationSpec = tween(GROW_MILLIS, delayMillis = ENTER_DELAY_MILLIS), + expandFrom = Alignment.Top, + ) + fadeIn(tween(DEFAULT_ANIMATION_MILLIS, delayMillis = SUBTITLE_DELAY_MILLIS)), + exit = shrinkVertically(tween(DEFAULT_ANIMATION_MILLIS), shrinkTowards = Alignment.Top) + + fadeOut(tween(DEFAULT_ANIMATION_MILLIS)), + ) { + (state.subtitle ?: lastSubtitle.value)?.let { subtitle -> + Text( + text = subtitle.resolveReference(), + style = TangemTheme.typography3.caption.medium, + color = contentColor, + modifier = Modifier.padding(top = SUBTITLE_TOP_GAP), + ) + } + } + } +} + +/** Key for the trailing [AnimatedContent]: whether the loader or a glyph shows, plus the [severity] that tints it. */ +private data class StatusBannerGlyph(val isLoading: Boolean, val severity: Severity) + +/** Trailing slot: rotating loader while in progress, the static severity status glyph once terminal. */ +@Composable +private fun StatusBannerTrailing(isLoading: Boolean, severity: Severity, modifier: Modifier = Modifier) { + // Keyed on (isLoading, severity) so the tint comes from each content's own key — the outgoing loader then fades + // out in its colour instead of snapping to the incoming status'. + AnimatedContent( + targetState = StatusBannerGlyph(isLoading, severity), + transitionSpec = { iconSwapTransition() }, + label = "StatusBannerTrailing", + modifier = modifier, + ) { glyph -> + val tint = glyph.severity.contentColor() + if (glyph.isLoading) { + TangemLoader(size = TangemLoaderSize.X20, color = tint) + } else { + Icon( + imageVector = glyph.severity.statusIcon(), + contentDescription = null, + tint = tint, + modifier = Modifier.size(20.dp), + ) + } + } +} + +@Composable +private fun Severity.backgroundColor(): Color = when (this) { + Severity.Info -> TangemTheme.colors3.bg.status.infoSubtle + Severity.Success -> TangemTheme.colors3.bg.status.successSubtle + Severity.Error -> TangemTheme.colors3.bg.status.errorSubtle + Severity.Warning -> TangemTheme.colors3.bg.status.warningSubtle +} + +@Composable +private fun Severity.contentColor(): Color = when (this) { + Severity.Info -> TangemTheme.colors3.text.status.info + Severity.Success -> TangemTheme.colors3.text.status.success + Severity.Error -> TangemTheme.colors3.text.status.error + Severity.Warning -> TangemTheme.colors3.text.status.warning +} + +private fun Severity.statusIcon() = when (this) { + Severity.Success -> Icons.ic_success_20 + Severity.Error -> Icons.ic_error_20 + Severity.Warning -> Icons.ic_warning_20 + Severity.Info -> Icons.ic_info_20 +} + +// region Preview + +@Preview(name = "Light", showBackground = true, widthDp = 360) +@Preview(name = "Dark", uiMode = UI_MODE_NIGHT_YES, showBackground = true, widthDp = 360) +@Composable +private fun TxHistoryDetailsStatusBannerPreview() { + TangemThemePreviewRedesign { + Column( + modifier = Modifier + .background(TangemTheme.colors3.bg.primary) + .padding(16.dp), + verticalArrangement = Arrangement.spacedBy(12.dp), + ) { + TxHistoryDetailsStatusBanner( + state = StatusBannerUM(Severity.Info, stringReference("Awaiting funds"), isLoading = true), + ) + TxHistoryDetailsStatusBanner( + state = StatusBannerUM(Severity.Info, stringReference("Deposit confirmed"), isLoading = true), + ) + TxHistoryDetailsStatusBanner( + state = StatusBannerUM(Severity.Success, stringReference("Confirmed"), isLoading = false), + ) + TxHistoryDetailsStatusBanner( + state = StatusBannerUM( + severity = Severity.Error, + title = stringReference("Failed"), + subtitle = stringReference("Visit provider's website to refund your money"), + isLoading = false, + ), + ) + TxHistoryDetailsStatusBanner( + state = StatusBannerUM( + severity = Severity.Warning, + title = stringReference("Verification required"), + subtitle = stringReference("Visit provider's website to refund your money"), + isLoading = false, + ), + ) + } + } +} +// endregion \ No newline at end of file diff --git a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/ui/TxHistoryDetailsTwoAssetsBlock.kt b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/ui/TxHistoryDetailsTwoAssetsBlock.kt new file mode 100644 index 0000000000..62e9dc2a16 --- /dev/null +++ b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/ui/TxHistoryDetailsTwoAssetsBlock.kt @@ -0,0 +1,300 @@ +package com.tangem.features.txhistory.ui + +import android.content.res.Configuration.UI_MODE_NIGHT_YES +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Icon +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.drawBehind +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathEffect +import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.text.style.TextDecoration +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import com.tangem.core.ui.R +import com.tangem.core.ui.components.currency.icon.CurrencyIconState +import com.tangem.core.ui.components.currency.icon.TangemCurrencyIcon +import com.tangem.core.ui.ds.image.DeviceIconUM +import com.tangem.core.ui.ds.image.TangemDeviceIcon +import com.tangem.core.ui.ds2.row.TangemRow +import com.tangem.core.ui.ds2.row.TangemRowContentLead +import com.tangem.core.ui.ds2.row.TangemRowVerticalAlignment +import com.tangem.core.ui.extensions.TextReference +import com.tangem.core.ui.extensions.resolveReference +import com.tangem.core.ui.extensions.stringReference +import com.tangem.core.ui.res.TangemTheme +import com.tangem.core.ui.res.TangemThemePreviewRedesign +import com.tangem.features.txhistory.entity.TxHistoryDetailsUM.AssetOwnerUM +import com.tangem.features.txhistory.entity.TxHistoryDetailsUM.AssetUM + +/** + * Two-asset ("exchange") block of the details card, used by Swap (and later Onramp): one `bg.tertiary` rounded cell + * with the [from] ("You sent") side over the [to] ("You receive") side, split by an inset dashed divider with a + * centered down-arrow masking the line. Each side is a [TangemRow]: label over the signed amount, avatar trailing. + * + * [Figma](https://www.figma.com/design/Qqm0dNTOnqtxLYEcmgc32C/Store?node-id=1265-87546) + * + * @param from Sent ("You sent" / "From …") side. + * @param to Received ("You receive" / "To …") side. + * @param modifier Modifier applied to the block container. + */ +@Composable +internal fun TxHistoryDetailsTwoAssetsBlock(from: AssetUM, to: AssetUM, modifier: Modifier = Modifier) { + Box( + modifier = modifier + .clip(RoundedCornerShape(24.dp)) + .background(TangemTheme.colors3.bg.tertiary), + ) { + Column( + modifier = Modifier.padding(vertical = 4.dp), + verticalArrangement = Arrangement.spacedBy(2.dp), + ) { + TwoAssetsSideRow(asset = from) + DashedDivider() + TwoAssetsSideRow(asset = to) + } + // Centered exchange arrow. Both rows are equal-height, so the block center sits on the divider; the + // `bg.tertiary` chip behind the icon masks the dashed line, reproducing the Figma center gap. + Box( + modifier = Modifier + .align(Alignment.Center) + .clip(CircleShape) + .background(TangemTheme.colors3.bg.tertiary) + .padding(4.dp), + ) { + Icon( + painter = painterResource(id = R.drawable.ic_arrow_down_24), + contentDescription = null, + tint = TangemTheme.colors3.icon.secondary, + modifier = Modifier.size(16.dp), + ) + } + } +} + +@Composable +private fun TwoAssetsSideRow(asset: AssetUM, modifier: Modifier = Modifier) { + TangemRow( + modifier = modifier, + contentLead = TangemRowContentLead.Start, + verticalAlignment = TangemRowVerticalAlignment.Center, + titleSlot = { TwoAssetsSideLabel(label = asset.label, owner = asset.owner) }, + subtitleSlot = { + Text( + text = asset.amount.resolveReference(), + style = TangemTheme.typography3.heading.small, + color = if (asset.isFaded) { + TangemTheme.colors3.text.tertiary + } else { + TangemTheme.colors3.text.primary + }, + textDecoration = if (asset.isFaded) TextDecoration.LineThrough else null, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + modifier = Modifier.padding(top = 6.dp), + ) + }, + endSlot = { + TangemCurrencyIcon( + state = asset.currencyIcon, + modifier = Modifier.size(40.dp), + ) + }, + ) +} + +/** + * Caption label above a leg amount. Renders the [label] prefix ("You sent" / "You receive", or "From" / "To" when an + * [owner] is present) and, for a resolved [owner], its inline 16dp decoration in the Figma order — the account avatar + * leads its name, the wallet key-card icon trails its name. + */ +@Composable +private fun TwoAssetsSideLabel(label: TextReference, owner: AssetOwnerUM?, modifier: Modifier = Modifier) { + Row( + modifier = modifier, + horizontalArrangement = Arrangement.spacedBy(4.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + LabelText(text = label) + when (owner) { + is AssetOwnerUM.Account -> { + AssetOwnerIcon(owner = owner) + LabelText(text = owner.name, modifier = Modifier.weight(weight = 1f, fill = false)) + } + is AssetOwnerUM.Wallet -> { + LabelText(text = owner.name, modifier = Modifier.weight(weight = 1f, fill = false)) + AssetOwnerIcon(owner = owner) + } + null -> Unit + } + } +} + +@Composable +private fun LabelText(text: TextReference, modifier: Modifier = Modifier) { + Text( + text = text.resolveReference(), + style = TangemTheme.typography3.caption.medium, + color = TangemTheme.colors3.text.secondary, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + modifier = modifier, + ) +} + +/** 16dp inline owner decoration: the account glyph over its color, or the wallet device card. */ +@Composable +private fun AssetOwnerIcon(owner: AssetOwnerUM, modifier: Modifier = Modifier) { + val iconModifier = modifier.size(16.dp) + when (owner) { + is AssetOwnerUM.Account -> Box( + modifier = iconModifier + .clip(RoundedCornerShape(4.dp)) + .background(owner.backgroundColor), + contentAlignment = Alignment.Center, + ) { + Icon( + painter = painterResource(id = owner.iconResId), + contentDescription = null, + // staticDark == white in both themes (the constant glyph tone for a colored avatar), matching the + // white-on-color account avatar in Figma and the counterparty card / history-list account icon. + tint = TangemTheme.colors3.icon.staticDark, + modifier = Modifier.size(8.dp), + ) + } + is AssetOwnerUM.Wallet -> TangemDeviceIcon( + state = owner.deviceIconUM, + modifier = iconModifier, + ) + } +} + +/** 1px inset dashed divider between the two sides, matching the Figma `divider` (dashed `line`). */ +@Composable +private fun DashedDivider(modifier: Modifier = Modifier) { + val color = TangemTheme.colors3.border.tertiary + Box( + modifier = modifier + .fillMaxWidth() + .padding(horizontal = 16.dp) + .height(1.dp) + .drawBehind { + val stroke = 1.dp.toPx() + val y = size.height / 2f + drawLine( + color = color, + start = Offset(x = 0f, y = y), + end = Offset(x = size.width, y = y), + strokeWidth = stroke, + cap = StrokeCap.Round, + pathEffect = PathEffect.dashPathEffect( + intervals = floatArrayOf(2.dp.toPx(), 4.dp.toPx()), + ), + ) + }, + ) +} + +// region Preview + +@Suppress("MagicNumber") +@Preview(name = "Light", showBackground = true, widthDp = 360) +@Preview(name = "Dark", uiMode = UI_MODE_NIGHT_YES, showBackground = true, widthDp = 360) +@Composable +private fun TxHistoryDetailsTwoAssetsBlockPreview() { + TangemThemePreviewRedesign { + Column( + modifier = Modifier + .background(TangemTheme.colors3.bg.primary) + .padding(16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), + ) { + // Plain swap (no resolved owner) — both sides settled. + TxHistoryDetailsTwoAssetsBlock( + from = previewAsset(label = "You sent", amount = "- 390 USDT", isFaded = false), + to = previewAsset(label = "You receive", amount = "+ 1,800.00 POL", isFaded = false), + ) + // Unsettled swap — the "You receive" side is struck through until the funds arrive. + TxHistoryDetailsTwoAssetsBlock( + from = previewAsset(label = "You sent", amount = "- 390 USDT", isFaded = false), + to = previewAsset(label = "You receive", amount = "1,800.00 POL", isFaded = true), + ) + // Account -> another account (own-to-own transfer between two of the user's accounts). + TxHistoryDetailsTwoAssetsBlock( + from = previewAsset( + label = "From", + amount = "- 390 USDT", + isFaded = false, + owner = AssetOwnerUM.Account( + name = stringReference("Main account"), + iconResId = R.drawable.ic_rounded_star_24, + backgroundColor = Color(0xFF007FFF), + ), + ), + to = previewAsset( + label = "To", + amount = "+ 1,800.00 POL", + isFaded = false, + owner = AssetOwnerUM.Account( + name = stringReference("Family"), + iconResId = R.drawable.ic_family_24, + backgroundColor = Color(0xFF744FF1), + ), + ), + ) + // Wallet -> another wallet (own-to-own transfer between two of the user's wallets). + TxHistoryDetailsTwoAssetsBlock( + from = previewAsset( + label = "From", + amount = "- 390 USDT", + isFaded = false, + owner = AssetOwnerUM.Wallet( + name = stringReference("Tangem 2.0"), + deviceIconUM = DeviceIconUM.Card(mainColor = Color(0xFF1E1E1E), secondColor = null), + ), + ), + to = previewAsset( + label = "To", + amount = "+ 1,800.00 POL", + isFaded = false, + owner = AssetOwnerUM.Wallet( + name = stringReference("My Wallet"), + deviceIconUM = DeviceIconUM.Ring(mainColor = Color(0xFF9F86FF)), + ), + ), + ) + } + } +} + +private fun previewAsset(label: String, amount: String, isFaded: Boolean, owner: AssetOwnerUM? = null) = AssetUM( + label = stringReference(label), + owner = owner, + amount = stringReference(amount), + currencyIcon = CurrencyIconState.CoinIcon( + url = null, + fallbackResId = R.drawable.img_eth_22, + isGrayscale = false, + shouldShowCustomBadge = false, + ), + isFaded = isFaded, +) + +// endregion \ No newline at end of file diff --git a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/utils/TxHistoryInfoMerger.kt b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/utils/TxHistoryInfoMerger.kt index e310aeca94..1830b1be74 100644 --- a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/utils/TxHistoryInfoMerger.kt +++ b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/utils/TxHistoryInfoMerger.kt @@ -1,7 +1,5 @@ package com.tangem.features.txhistory.utils -import com.tangem.domain.express.models.ExpressExchangeStatus -import com.tangem.domain.express.models.ExpressOnrampStatus import com.tangem.domain.models.network.TxInfo import com.tangem.domain.txhistory.model.ExpressTx import com.tangem.domain.txhistory.model.OnChainTx @@ -50,48 +48,4 @@ private fun ExpressTx.withMatchedTxInfo(txInfo: TxInfo): ExpressTx { is ExpressTx.Swap -> copy(txInfo = matched) is ExpressTx.Onramp -> copy(txInfo = matched) } -} - -/** - * Synthesizes a [TxInfo] view of an express op so it can be rendered by the existing - * [com.tangem.features.txhistory.converter.TxHistoryItemToTransactionItemUMConverter]. Rendered as a - * [TxInfo.TransactionType.Swap] for now (onramp included). The amount is the viewed-currency leg. - */ -internal fun ExpressTx.toSyntheticTxInfo(): TxInfo { - val viewedAmount = when (this) { - is ExpressTx.Swap -> if (isOutgoing) tx.fromAsset.amount else tx.toAsset.amount - is ExpressTx.Onramp -> tx.toAsset.amount - } - val isOutgoing = when (this) { - is ExpressTx.Swap -> this.isOutgoing - is ExpressTx.Onramp -> false - } - return TxInfo( - // matchHash is the on-chain hash (== the matched leg's hash, enables the explorer link); else txId. - txHash = matchHash ?: txId, - timestampInMillis = timestampMillis, - isOutgoing = isOutgoing, - destinationType = TxInfo.DestinationType.Single(TxInfo.AddressType.User(address = "")), - sourceType = TxInfo.SourceType.Single(address = ""), - interactionAddressType = null, - status = toTransactionStatus(), - type = TxInfo.TransactionType.Swap, - amount = viewedAmount, - ) -} - -/** - * Maps the typed express status to the on-chain-shaped [TxInfo.TransactionStatus] used by the UI: - * the single success state (`Finished`) → Confirmed, any other terminal state → Failed, in-progress → Unconfirmed. - */ -private fun ExpressTx.toTransactionStatus(): TxInfo.TransactionStatus { - val isFinished = when (this) { - is ExpressTx.Swap -> tx.status == ExpressExchangeStatus.Finished - is ExpressTx.Onramp -> tx.status == ExpressOnrampStatus.Finished - } - return when { - isFinished -> TxInfo.TransactionStatus.Confirmed - isTerminal -> TxInfo.TransactionStatus.Failed - else -> TxInfo.TransactionStatus.Unconfirmed - } } \ No newline at end of file diff --git a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/utils/TxHistoryLegacyUiManager.kt b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/utils/TxHistoryLegacyUiManager.kt index 8c5c5fd107..a4e1c8b90d 100644 --- a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/utils/TxHistoryLegacyUiManager.kt +++ b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/utils/TxHistoryLegacyUiManager.kt @@ -7,11 +7,14 @@ import com.tangem.features.txhistory.converter.TxHistoryItemToTransactionStateCo import com.tangem.features.txhistory.entity.TxHistoryUM import com.tangem.pagination.Batch import com.tangem.pagination.PaginationStatus +import com.tangem.utils.annotations.RemoveWithToggle import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.toImmutableList import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.* +@Deprecated("Remove with main toggle [DesignFeatureToggles.isRedesignEnabled]. Renders pre-redesign tx-history UI.") +@RemoveWithToggle("APP_REDESIGN_ENABLED") internal class TxHistoryLegacyUiManager( private val state: MutableStateFlow, private val txHistoryItemConverter: TxHistoryItemToTransactionStateConverter, diff --git a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/utils/TxHistoryListManager.kt b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/utils/TxHistoryListManager.kt index d3b0628dbf..06a014161f 100644 --- a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/utils/TxHistoryListManager.kt +++ b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/utils/TxHistoryListManager.kt @@ -16,6 +16,7 @@ import com.tangem.pagination.BatchAction import com.tangem.pagination.BatchFetchResult import com.tangem.pagination.BatchListState import com.tangem.pagination.PaginationStatus +import com.tangem.utils.annotations.RemoveWithToggle import com.tangem.utils.coroutines.CoroutineDispatcherProvider import com.tangem.utils.coroutines.JobHolder import com.tangem.utils.coroutines.saveIn @@ -26,6 +27,8 @@ import kotlinx.coroutines.flow.* private typealias TxHistoryBatchAction = BatchAction @Suppress("LongParameterList") +@Deprecated("Remove with toggle [TxHistoryFeatureToggles.isNewTxHistoryEnabled]. Replaced by HistoryTxListManager.") +@RemoveWithToggle("AND_15767_NEW_TX_HISTORY_ENABLED") internal class TxHistoryListManager( private val repository: TxHistoryRepositoryV2, private val dispatchers: CoroutineDispatcherProvider, diff --git a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/utils/TxHistoryListState.kt b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/utils/TxHistoryListState.kt index e1b9a8ccf9..3d4bd8ffcb 100644 --- a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/utils/TxHistoryListState.kt +++ b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/utils/TxHistoryListState.kt @@ -6,8 +6,11 @@ import com.tangem.features.txhistory.entity.TxHistoryItemsUM import com.tangem.features.txhistory.entity.TxHistoryUM import com.tangem.pagination.Batch import com.tangem.pagination.PaginationStatus +import com.tangem.utils.annotations.RemoveWithToggle -data class TxHistoryListState( +@Deprecated("Remove with toggle [TxHistoryFeatureToggles.isNewTxHistoryEnabled]. Used only by TxHistoryListManager.") +@RemoveWithToggle("AND_15767_NEW_TX_HISTORY_ENABLED") +internal data class TxHistoryListState( val status: PaginationStatus<*> = PaginationStatus.None, val rawBatches: List>> = emptyList(), val uiBatches: List>> = emptyList(), diff --git a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/utils/TxHistoryUiManager.kt b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/utils/TxHistoryUiManager.kt index 83b868fc40..d0de741860 100644 --- a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/utils/TxHistoryUiManager.kt +++ b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/utils/TxHistoryUiManager.kt @@ -8,11 +8,14 @@ import com.tangem.features.txhistory.converter.TxHistoryItemToTransactionItemUMC import com.tangem.features.txhistory.entity.TxHistoryItemsUM import com.tangem.pagination.Batch import com.tangem.pagination.PaginationStatus +import com.tangem.utils.annotations.RemoveWithToggle import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.toImmutableList import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.* +@Deprecated("Remove with toggle [TxHistoryFeatureToggles.isNewTxHistoryEnabled]. Used only by TxHistoryListManager.") +@RemoveWithToggle("AND_15767_NEW_TX_HISTORY_ENABLED") internal class TxHistoryUiManager( private val state: MutableStateFlow, ) { diff --git a/features/txhistory/impl/src/test/kotlin/com/tangem/features/txhistory/converter/ExpressTxToTransactionItemUMConverterTest.kt b/features/txhistory/impl/src/test/kotlin/com/tangem/features/txhistory/converter/ExpressTxToTransactionItemUMConverterTest.kt new file mode 100644 index 0000000000..ee4a06fb0f --- /dev/null +++ b/features/txhistory/impl/src/test/kotlin/com/tangem/features/txhistory/converter/ExpressTxToTransactionItemUMConverterTest.kt @@ -0,0 +1,289 @@ +package com.tangem.features.txhistory.converter + +import com.google.common.truth.Truth.assertThat +import com.google.common.truth.Truth.assertWithMessage +import com.tangem.core.ui.components.transactions.state.TransactionItemUM +import com.tangem.core.ui.components.transactions.state.TransactionItemUM.Content.Status +import com.tangem.core.ui.components.transactions.state.TransactionItemUM.ContentSubtitle +import com.tangem.core.ui.extensions.resourceReference +import com.tangem.domain.express.models.ExchangeTransaction +import com.tangem.domain.express.models.ExpressAsset.ID as ExpressAssetId +import com.tangem.domain.express.models.ExpressExchangeStatus +import com.tangem.domain.express.models.ExpressOnrampStatus +import com.tangem.domain.express.models.ExpressTransactionAsset +import com.tangem.domain.express.models.OnrampTransaction +import com.tangem.domain.models.currency.CryptoCurrency +import com.tangem.domain.models.network.Network +import com.tangem.domain.tokens.model.Amount +import com.tangem.domain.tokens.model.AmountType +import com.tangem.domain.txhistory.model.ExpressTx +import com.tangem.features.txhistory.impl.R +import com.tangem.features.txhistory.utils.TxHistoryUiActions +import io.mockk.mockk +import io.mockk.verify +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.TestInstance +import java.math.BigDecimal + +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +internal class ExpressTxToTransactionItemUMConverterTest { + + private val txHistoryUiActions: TxHistoryUiActions = mockk(relaxed = true) + private val coin: CryptoCurrency.Coin = createCoin(symbol = "ETH", decimals = 18) + + private val converter = ExpressTxToTransactionItemUMConverter( + currency = coin, + txHistoryUiActions = txHistoryUiActions, + ) + + // region Status → bucket + + @Test + fun `GIVEN every swap status WHEN convert THEN mapped to expected status bucket`() { + val cases = mapOf( + ExpressExchangeStatus.Finished to Status.Confirmed, + ExpressExchangeStatus.Failed to Status.Failed, + ExpressExchangeStatus.TxFailed to Status.Failed, + ExpressExchangeStatus.Refunded to Status.Failed, + ExpressExchangeStatus.Expired to Status.Failed, + ExpressExchangeStatus.Unknown to Status.Failed, + ExpressExchangeStatus.Preview to Status.Unconfirmed, + ExpressExchangeStatus.Created to Status.Unconfirmed, + ExpressExchangeStatus.ExchangeTxSent to Status.Unconfirmed, + ExpressExchangeStatus.Waiting to Status.Unconfirmed, + ExpressExchangeStatus.WaitingTxHash to Status.Unconfirmed, + ExpressExchangeStatus.Confirming to Status.Unconfirmed, + ExpressExchangeStatus.Exchanging to Status.Unconfirmed, + ExpressExchangeStatus.Sending to Status.Unconfirmed, + ExpressExchangeStatus.Verifying to Status.Unconfirmed, + ExpressExchangeStatus.Paused to Status.Unconfirmed, + ) + // every enum entry is covered (guards against new statuses silently falling through) + assertThat(cases.keys).containsExactlyElementsIn(ExpressExchangeStatus.entries) + + cases.forEach { (status, expected) -> + val result = converter.convert(createSwap(status = status)) as TransactionItemUM.Content + assertWithMessage(status.name).that(result.status).isEqualTo(expected) + } + } + + @Test + fun `GIVEN every onramp status WHEN convert THEN mapped to expected status bucket`() { + val cases = mapOf( + ExpressOnrampStatus.Finished to Status.Confirmed, + ExpressOnrampStatus.Failed to Status.Failed, + ExpressOnrampStatus.Expired to Status.Failed, + ExpressOnrampStatus.Unknown to Status.Failed, + ExpressOnrampStatus.Created to Status.Unconfirmed, + ExpressOnrampStatus.WaitingForPayment to Status.Unconfirmed, + ExpressOnrampStatus.PaymentProcessing to Status.Unconfirmed, + ExpressOnrampStatus.Verifying to Status.Unconfirmed, + ExpressOnrampStatus.Paid to Status.Unconfirmed, + ExpressOnrampStatus.Sending to Status.Unconfirmed, + ExpressOnrampStatus.Paused to Status.Unconfirmed, + ) + assertThat(cases.keys).containsExactlyElementsIn(ExpressOnrampStatus.entries) + + cases.forEach { (status, expected) -> + val result = converter.convert(createOnramp(status = status)) as TransactionItemUM.Content + assertWithMessage(status.name).that(result.status).isEqualTo(expected) + } + } + + // endregion + + // region Amount sign / prefix + + @Test + fun `GIVEN outgoing swap WHEN convert THEN amount is negative from-leg`() { + val result = converter.convert( + createSwap(status = ExpressExchangeStatus.Waiting, isOutgoing = true), + ) as TransactionItemUM.Content + + assertThat(result.direction).isEqualTo(TransactionItemUM.Content.Direction.OUTGOING) + assertThat(result.amount).startsWith("-") + assertThat(result.amount).contains("1.5") + } + + @Test + fun `GIVEN incoming swap WHEN convert THEN amount is positive to-leg`() { + val result = converter.convert( + createSwap(status = ExpressExchangeStatus.Waiting, isOutgoing = false), + ) as TransactionItemUM.Content + + assertThat(result.direction).isEqualTo(TransactionItemUM.Content.Direction.INCOMING) + assertThat(result.amount).startsWith("+") + assertThat(result.amount).contains("0.001") + } + + @Test + fun `GIVEN finished onramp WHEN convert THEN amount prefixed with plus`() { + val result = converter.convert(createOnramp(status = ExpressOnrampStatus.Finished)) as TransactionItemUM.Content + assertThat(result.amount).startsWith("+") + } + + @Test + fun `GIVEN in-progress onramp WHEN convert THEN amount prefixed with tilde`() { + val result = converter.convert(createOnramp(status = ExpressOnrampStatus.Sending)) as TransactionItemUM.Content + assertThat(result.amount).startsWith("~") + } + + @Test + fun `GIVEN failed onramp WHEN convert THEN amount has no sign prefix`() { + val result = converter.convert(createOnramp(status = ExpressOnrampStatus.Failed)) as TransactionItemUM.Content + assertThat(requireNotNull(result.amount).first()) + .isIn(listOf('0', '1', '2', '3', '4', '5', '6', '7', '8', '9')) + } + + @Test + fun `GIVEN swap with null viewed amount WHEN convert THEN amount is null`() { + val result = converter.convert( + createSwap(status = ExpressExchangeStatus.Waiting, isOutgoing = true, fromAmount = null), + ) as TransactionItemUM.Content + + assertThat(result.amount).isNull() + } + + @Test + fun `GIVEN onramp with null amount WHEN convert THEN amount is null`() { + val result = converter.convert( + createOnramp(status = ExpressOnrampStatus.Sending, toAmount = null), + ) as TransactionItemUM.Content + + assertThat(result.amount).isNull() + } + + // endregion + + // region Title / subtitle / warning / click + + @Test + fun `GIVEN swap statuses WHEN convert THEN status-aware title`() { + val swapping = converter.convert(createSwap(status = ExpressExchangeStatus.Waiting)) as TransactionItemUM.Content + val swapped = converter.convert(createSwap(status = ExpressExchangeStatus.Finished)) as TransactionItemUM.Content + + assertThat(swapping.title).isEqualTo(resourceReference(R.string.common_swapping)) + assertThat(swapped.title).isEqualTo(resourceReference(R.string.common_swapped)) + } + + @Test + fun `GIVEN onramp statuses WHEN convert THEN status-aware title`() { + val topUp = converter.convert(createOnramp(status = ExpressOnrampStatus.Sending)) as TransactionItemUM.Content + val toppedUp = converter.convert(createOnramp(status = ExpressOnrampStatus.Finished)) as TransactionItemUM.Content + + assertThat(topUp.title).isEqualTo(resourceReference(R.string.tx_history_onramp_top_up)) + assertThat(toppedUp.title).isEqualTo(resourceReference(R.string.tx_history_onramp_topped_up)) + } + + @Test + fun `GIVEN outgoing swap WHEN convert THEN subtitle shows TO counterparty ticker`() { + val result = converter.convert( + createSwap(status = ExpressExchangeStatus.Waiting, isOutgoing = true), + ) as TransactionItemUM.Content + + val subtitle = result.subtitle as ContentSubtitle.Asset + assertThat(subtitle.direction).isEqualTo(ContentSubtitle.Direction.TO) + assertThat(subtitle.symbol).isEqualTo("btc") // mock: counterparty (to-leg) networkId + } + + @Test + fun `GIVEN onramp WHEN convert THEN subtitle shows FROM fiat code`() { + val result = converter.convert(createOnramp(status = ExpressOnrampStatus.Sending)) as TransactionItemUM.Content + + val subtitle = result.subtitle as ContentSubtitle.Asset + assertThat(subtitle.direction).isEqualTo(ContentSubtitle.Direction.FROM) + assertThat(subtitle.symbol).isEqualTo("SEK") + } + + @Test + fun `GIVEN matched on-chain leg WHEN row clicked THEN opens explorer by match hash`() { + val result = converter.convert( + createSwap(status = ExpressExchangeStatus.Waiting, matchHash = "0xhash", isOutgoing = true), + ) as TransactionItemUM.Content + + result.onClick() + + verify { txHistoryUiActions.openTxInExplorer("0xhash") } + } + + // endregion + + private fun createSwap( + status: ExpressExchangeStatus, + matchHash: String? = null, + isOutgoing: Boolean = true, + fromAmount: BigDecimal? = BigDecimal("1.5"), + toAmount: BigDecimal? = BigDecimal("0.001"), + ) = ExpressTx.Swap( + tx = ExchangeTransaction( + txId = "tx-1", + status = status, + createdAtMillis = 100, + provider = null, + payinHash = matchHash.takeIf { isOutgoing }, + payoutHash = matchHash.takeUnless { isOutgoing }, + fromAsset = ExpressTransactionAsset( + id = ExpressAssetId(networkId = "eth", contractAddress = "0"), + amount = fromAmount, + decimals = 18, + ), + toAsset = ExpressTransactionAsset( + id = ExpressAssetId(networkId = "btc", contractAddress = "0xt"), + amount = toAmount, + decimals = 8, + ), + ), + isOutgoing = isOutgoing, + txInfo = null, + ) + + private fun createOnramp( + status: ExpressOnrampStatus, + toAmount: BigDecimal? = BigDecimal("0.006339"), + ) = ExpressTx.Onramp( + tx = OnrampTransaction( + txId = "tx-2", + status = status, + createdAtMillis = 100, + provider = null, + payoutHash = null, + fromFiat = Amount( + currencySymbol = "SEK", + value = BigDecimal("100"), + decimals = 2, + type = AmountType.FiatType(code = "SEK"), + ), + toAsset = ExpressTransactionAsset( + id = ExpressAssetId(networkId = "btc", contractAddress = "0"), + amount = toAmount, + decimals = 8, + ), + ), + txInfo = null, + ) + + private fun createCoin(symbol: String, decimals: Int): CryptoCurrency.Coin = CryptoCurrency.Coin( + id = CryptoCurrency.ID( + prefix = CryptoCurrency.ID.Prefix.COIN_PREFIX, + body = CryptoCurrency.ID.Body.NetworkId(rawId = "ethereum"), + suffix = CryptoCurrency.ID.Suffix.RawID(rawId = "ethereum"), + ), + network = Network( + id = Network.ID(value = "ethereum", derivationPath = Network.DerivationPath.None), + name = "Ethereum", + currencySymbol = symbol, + derivationPath = Network.DerivationPath.None, + isTestnet = false, + standardType = Network.StandardType.ERC20, + hasFiatFeeRate = true, + canHandleTokens = true, + transactionExtrasType = Network.TransactionExtrasType.NONE, + nameResolvingType = Network.NameResolvingType.NONE, + ), + name = "Ethereum", + symbol = symbol, + decimals = decimals, + iconUrl = null, + isCustom = false, + ) +} \ No newline at end of file diff --git a/features/txhistory/impl/src/test/kotlin/com/tangem/features/txhistory/converter/TxHistoryItemToTransactionItemUMConverterTest.kt b/features/txhistory/impl/src/test/kotlin/com/tangem/features/txhistory/converter/TxHistoryItemToTransactionItemUMConverterTest.kt index ae76d9a485..ed577e236b 100644 --- a/features/txhistory/impl/src/test/kotlin/com/tangem/features/txhistory/converter/TxHistoryItemToTransactionItemUMConverterTest.kt +++ b/features/txhistory/impl/src/test/kotlin/com/tangem/features/txhistory/converter/TxHistoryItemToTransactionItemUMConverterTest.kt @@ -161,8 +161,8 @@ internal class TxHistoryItemToTransactionItemUMConverterTest { assertThat(result.subtitle).isEqualTo( ContentSubtitle.Plain(resRef(R.string.transaction_history_earned_from_stake)), ) - assertThat(result.amount.startsWith(StringsSigns.PLUS)).isFalse() - assertThat(result.amount.startsWith(StringsSigns.MINUS)).isFalse() + assertThat(result.amount!!.startsWith(StringsSigns.PLUS)).isFalse() + assertThat(result.amount!!.startsWith(StringsSigns.MINUS)).isFalse() } @Test @@ -514,7 +514,7 @@ internal class TxHistoryItemToTransactionItemUMConverterTest { val result = coinConverter.convert(tx) as TransactionItemUM.Content - assertThat(result.amount.startsWith(StringsSigns.MINUS)).isTrue() + assertThat(result.amount!!.startsWith(StringsSigns.MINUS)).isTrue() } @Test @@ -528,7 +528,7 @@ internal class TxHistoryItemToTransactionItemUMConverterTest { val result = coinConverter.convert(tx) as TransactionItemUM.Content - assertThat(result.amount.startsWith(StringsSigns.PLUS)).isTrue() + assertThat(result.amount!!.startsWith(StringsSigns.PLUS)).isTrue() } @Test @@ -543,8 +543,8 @@ internal class TxHistoryItemToTransactionItemUMConverterTest { val result = coinConverter.convert(tx) as TransactionItemUM.Content - assertThat(result.amount.startsWith(StringsSigns.MINUS)).isFalse() - assertThat(result.amount.startsWith(StringsSigns.PLUS)).isFalse() + assertThat(result.amount!!.startsWith(StringsSigns.MINUS)).isFalse() + assertThat(result.amount!!.startsWith(StringsSigns.PLUS)).isFalse() } @Test @@ -558,8 +558,8 @@ internal class TxHistoryItemToTransactionItemUMConverterTest { val result = coinConverter.convert(tx) as TransactionItemUM.Content - assertThat(result.amount.startsWith(StringsSigns.MINUS)).isFalse() - assertThat(result.amount.startsWith(StringsSigns.PLUS)).isFalse() + assertThat(result.amount!!.startsWith(StringsSigns.MINUS)).isFalse() + assertThat(result.amount!!.startsWith(StringsSigns.PLUS)).isFalse() } // endregion diff --git a/features/txhistory/impl/src/test/kotlin/com/tangem/features/txhistory/converter/TxInfoToTxHistoryDetailsUMConverterTest.kt b/features/txhistory/impl/src/test/kotlin/com/tangem/features/txhistory/converter/TxInfoToTxHistoryDetailsUMConverterTest.kt index 7d7eb52f06..2ddf7a9b3a 100644 --- a/features/txhistory/impl/src/test/kotlin/com/tangem/features/txhistory/converter/TxInfoToTxHistoryDetailsUMConverterTest.kt +++ b/features/txhistory/impl/src/test/kotlin/com/tangem/features/txhistory/converter/TxInfoToTxHistoryDetailsUMConverterTest.kt @@ -102,6 +102,61 @@ internal class TxInfoToTxHistoryDetailsUMConverterTest { assertThat(header.iconRes).isEqualTo(R.drawable.ic_exchange_vertical_24) } + @Test + fun `GIVEN unconfirmed Swap WHEN convert THEN info status banner with loader`() { + // Arrange + val tx = txInfo(type = TransactionType.Swap, status = TxInfo.TransactionStatus.Unconfirmed) + + // Act + val banner = (converter.convert(tx) as TxHistoryDetailsUM.TwoAssets).statusBanner + + // Assert + assertThat(banner).isEqualTo( + TxHistoryDetailsUM.StatusBannerUM( + severity = TxHistoryDetailsUM.StatusBannerUM.Severity.Info, + title = resourceReference(R.string.express_exchange_status_receiving_active), + isLoading = true, + ), + ) + } + + @Test + fun `GIVEN confirmed Swap WHEN convert THEN success status banner without loader`() { + // Arrange + val tx = txInfo(type = TransactionType.Swap, status = TxInfo.TransactionStatus.Confirmed) + + // Act + val banner = (converter.convert(tx) as TxHistoryDetailsUM.TwoAssets).statusBanner + + // Assert + assertThat(banner).isEqualTo( + TxHistoryDetailsUM.StatusBannerUM( + severity = TxHistoryDetailsUM.StatusBannerUM.Severity.Success, + title = resourceReference(R.string.express_exchange_status_exchanged), + isLoading = false, + ), + ) + } + + @Test + fun `GIVEN failed Swap WHEN convert THEN error status banner with refund subtitle`() { + // Arrange + val tx = txInfo(type = TransactionType.Swap, status = TxInfo.TransactionStatus.Failed) + + // Act + val banner = (converter.convert(tx) as TxHistoryDetailsUM.TwoAssets).statusBanner + + // Assert + assertThat(banner).isEqualTo( + TxHistoryDetailsUM.StatusBannerUM( + severity = TxHistoryDetailsUM.StatusBannerUM.Severity.Error, + title = resourceReference(R.string.express_exchange_status_failed), + subtitle = resourceReference(R.string.express_exchange_notification_failed_text), + isLoading = false, + ), + ) + } + @Test fun `GIVEN incoming Transfer WHEN convert THEN amount block has plus sign and not failed`() { // Arrange diff --git a/features/txhistory/impl/src/test/kotlin/com/tangem/features/txhistory/utils/TxHistoryInfoMergerTest.kt b/features/txhistory/impl/src/test/kotlin/com/tangem/features/txhistory/utils/TxHistoryInfoMergerTest.kt index 7413a5ae9f..f4a022d2c1 100644 --- a/features/txhistory/impl/src/test/kotlin/com/tangem/features/txhistory/utils/TxHistoryInfoMergerTest.kt +++ b/features/txhistory/impl/src/test/kotlin/com/tangem/features/txhistory/utils/TxHistoryInfoMergerTest.kt @@ -85,21 +85,6 @@ internal class TxHistoryInfoMergerTest { assertThat(result.map { it.timestampMillis }).containsExactly(200L, 100L).inOrder() } - @Test - fun `GIVEN outgoing swap WHEN toSyntheticTxInfo THEN viewed from-leg amount and swap type`() { - // Arrange - val swap = createSwap(matchHash = "missing", status = ExpressExchangeStatus.Waiting, isOutgoing = true) - - // Act - val txInfo = swap.toSyntheticTxInfo() - - // Assert - assertThat(txInfo.isOutgoing).isTrue() - assertThat(txInfo.amount).isEqualTo(BigDecimal("1.5")) - assertThat(txInfo.type).isEqualTo(TxInfo.TransactionType.Swap) - assertThat(txInfo.status).isEqualTo(TxInfo.TransactionStatus.Unconfirmed) - } - private fun createTxInfo(txHash: String, timestamp: Long) = TxInfo( txHash = txHash, timestampInMillis = timestamp, diff --git a/features/wallet/impl/src/test/kotlin/com/tangem/feature/wallet/presentation/wallet/deeplink/DefaultPromoDeeplinkHandlerTest.kt b/features/wallet/impl/src/test/kotlin/com/tangem/feature/wallet/presentation/wallet/deeplink/DefaultPromoDeeplinkHandlerTest.kt index 135cccb51e..298beb8462 100644 --- a/features/wallet/impl/src/test/kotlin/com/tangem/feature/wallet/presentation/wallet/deeplink/DefaultPromoDeeplinkHandlerTest.kt +++ b/features/wallet/impl/src/test/kotlin/com/tangem/feature/wallet/presentation/wallet/deeplink/DefaultPromoDeeplinkHandlerTest.kt @@ -24,8 +24,8 @@ import com.tangem.domain.models.wallet.UserWalletId import com.tangem.domain.networks.multi.MultiNetworkStatusSupplier import com.tangem.domain.tokens.MultiWalletCryptoCurrenciesSupplier import com.tangem.domain.wallets.PromoCodeActivationResult -import com.tangem.domain.wallets.models.GetUserWalletError import com.tangem.domain.wallets.models.errors.ActivatePromoCodeError +import com.tangem.domain.wallets.models.errors.GetUserWalletError import com.tangem.domain.wallets.usecase.ActivateBitcoinPromocodeUseCase import com.tangem.domain.wallets.usecase.BindRefcodeWithWalletUseCase import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase @@ -82,7 +82,6 @@ class DefaultPromoDeeplinkHandlerTest { every { analyticsEventHandler.send(any()) } returns Unit messages = mutableListOf() every { uiMessageSender.send(capture(messages)) } just runs - } @Test @@ -499,13 +498,21 @@ class DefaultPromoDeeplinkHandlerTest { ) coEvery { multiNetworkStatusSupplier.invoke(any()) } returns flowOf(setOf(btcStatusCard, btcStatusCustom)) - val btcCoinCustom = buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCustom) - val btcCoinCard = buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCard) + val btcCoinCustom = + buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCustom) + val btcCoinCard = + buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCard) coEvery { multiWalletCryptoCurrenciesSupplier.getSyncOrNull(any()) } returns setOf( btcCoinCustom, btcCoinCard, ) - coEvery { activateBitcoinPromocodeUseCase.invoke(any(), "bc1qcustom", promoCode) } returns Either.Right("ok") + coEvery { + activateBitcoinPromocodeUseCase.invoke( + any(), + "bc1qcustom", + promoCode + ) + } returns Either.Right("ok") val dispatcherProvider = testDispatcherProvider(testScheduler) @@ -556,7 +563,8 @@ class DefaultPromoDeeplinkHandlerTest { ) coEvery { multiNetworkStatusSupplier.invoke(any()) } returns flowOf(setOf(btcStatusCard, btcStatusCustom)) - val btcCoinCard = buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCard) + val btcCoinCard = + buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCard) coEvery { multiWalletCryptoCurrenciesSupplier.getSyncOrNull(any()) } returns setOf(btcCoinCard) coEvery { activateBitcoinPromocodeUseCase.invoke(any(), "bc1qcard", promoCode) } returns Either.Right("ok") @@ -643,7 +651,7 @@ class DefaultPromoDeeplinkHandlerTest { Truth.assertThat(sent.title).isEqualTo(resourceReference(R.string.bitcoin_promo_no_address_title)) Truth.assertThat(sent.message).isEqualTo(resourceReference(R.string.bitcoin_promo_no_address)) - coVerify(exactly = 0) { activateBitcoinPromocodeUseCase.invoke(any(),any(), any()) } + coVerify(exactly = 0) { activateBitcoinPromocodeUseCase.invoke(any(), any(), any()) } verify( exactly = 1, @@ -673,8 +681,10 @@ class DefaultPromoDeeplinkHandlerTest { ) coEvery { multiNetworkStatusSupplier.invoke(any()) } returns flowOf(setOf(btcStatusCard)) - val btcCoinCustom = buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCustom) - val btcCoinCard = buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCard) + val btcCoinCustom = + buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCustom) + val btcCoinCard = + buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCard) coEvery { multiWalletCryptoCurrenciesSupplier.getSyncOrNull(any()) } returns setOf( btcCoinCustom, btcCoinCard, @@ -732,7 +742,8 @@ class DefaultPromoDeeplinkHandlerTest { ) coEvery { multiNetworkStatusSupplier.invoke(any()) } returns flowOf(setOf(btcStatusCustom)) - val btcCoinCard = buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCard) + val btcCoinCard = + buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCard) coEvery { multiWalletCryptoCurrenciesSupplier.getSyncOrNull(any()) } returns setOf(btcCoinCard) val dispatcherProvider = testDispatcherProvider(testScheduler) @@ -787,7 +798,8 @@ class DefaultPromoDeeplinkHandlerTest { ) coEvery { multiNetworkStatusSupplier.invoke(any()) } returns flowOf(setOf(btcStatusCard)) - val btcCoinCustom = buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCustom) + val btcCoinCustom = + buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCustom) coEvery { multiWalletCryptoCurrenciesSupplier.getSyncOrNull(any()) } returns setOf(btcCoinCustom) val dispatcherProvider = testDispatcherProvider(testScheduler) diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/routing/DefaultWcRoutingComponent.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/routing/DefaultWcRoutingComponent.kt index 7d579aa7b1..f4af23a286 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/routing/DefaultWcRoutingComponent.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/routing/DefaultWcRoutingComponent.kt @@ -15,8 +15,8 @@ import com.tangem.core.decompose.context.childByContext import com.tangem.core.decompose.model.getOrCreateModel import com.tangem.core.ui.decompose.ComposableContentComponent import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorComponent -import com.tangem.features.send.api.FeeSelectorBlockComponent -import com.tangem.features.send.api.FeeSelectorComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorComponent import com.tangem.features.walletconnect.components.WcRoutingComponent import com.tangem.features.walletconnect.connections.components.AlertsComponent import com.tangem.features.walletconnect.connections.components.AlertsComponent.AlertType.* diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/PreviewFeeSelectorBlockComponent.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/PreviewFeeSelectorBlockComponent.kt index 9aa7cdf947..e6e22a52e5 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/PreviewFeeSelectorBlockComponent.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/PreviewFeeSelectorBlockComponent.kt @@ -17,8 +17,8 @@ import com.tangem.core.ui.components.audits.AuditLabelUM import com.tangem.core.ui.extensions.stringReference import com.tangem.core.ui.extensions.stringResourceSafe import com.tangem.core.ui.res.TangemTheme -import com.tangem.features.send.api.FeeSelectorBlockComponent -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.walletconnect.impl.R internal class PreviewFeeSelectorBlockComponent : FeeSelectorBlockComponent { diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/common/WcNavigationUtils.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/common/WcNavigationUtils.kt index fcb776bd14..e3a43c45ba 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/common/WcNavigationUtils.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/common/WcNavigationUtils.kt @@ -3,10 +3,10 @@ package com.tangem.features.walletconnect.transaction.components.common import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.ui.decompose.ComposableBottomSheetComponent import com.tangem.domain.walletconnect.WcAnalyticEvents -import com.tangem.features.send.api.FeeSelectorComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorComponent import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents -import com.tangem.features.send.api.params.FeeSelectorParams.FeeDisplaySource -import com.tangem.features.send.api.params.FeeSelectorParams.FeeSelectorDetailsParams +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams.FeeDisplaySource +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams.FeeSelectorDetailsParams import com.tangem.features.walletconnect.connections.components.AlertsComponentV2 import com.tangem.features.walletconnect.connections.utils.WcAlertsFactory.createCommonTransactionAppInfoAlertUM import com.tangem.features.walletconnect.transaction.components.send.WcCustomAllowanceComponent diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/send/WcSendTransactionComponent.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/send/WcSendTransactionComponent.kt index 9173c11909..a242b33bfd 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/send/WcSendTransactionComponent.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/send/WcSendTransactionComponent.kt @@ -7,10 +7,10 @@ import com.arkivanov.essenty.lifecycle.doOnResume import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.ui.decompose.ComposableBottomSheetComponent import com.tangem.domain.walletconnect.WcAnalyticEvents -import com.tangem.features.send.api.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents -import com.tangem.features.send.api.entity.FeeSelectorUM -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams import com.tangem.features.walletconnect.transaction.entity.common.WcTransactionFeeState import com.tangem.features.walletconnect.transaction.model.WcSendTransactionModel import com.tangem.features.walletconnect.transaction.ui.send.WcSendTransactionModalBottomSheet diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/send/WcSendTransactionContainerComponent.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/send/WcSendTransactionContainerComponent.kt index f7b4cc1549..9835a4c144 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/send/WcSendTransactionContainerComponent.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/send/WcSendTransactionContainerComponent.kt @@ -5,8 +5,8 @@ import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.decompose.context.childByContext import com.tangem.core.decompose.model.getOrCreateModel import com.tangem.core.ui.decompose.ComposableBottomSheetComponent -import com.tangem.features.send.api.FeeSelectorBlockComponent -import com.tangem.features.send.api.FeeSelectorComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorComponent import com.tangem.features.walletconnect.transaction.components.common.WcCommonTransactionComponentDelegate import com.tangem.features.walletconnect.transaction.components.common.WcTransactionModelParams import com.tangem.features.walletconnect.transaction.components.common.getWcCommonScreen diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/converter/WcSendTransactionUMConverter.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/converter/WcSendTransactionUMConverter.kt index 6decf0a891..6bd7e45e31 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/converter/WcSendTransactionUMConverter.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/converter/WcSendTransactionUMConverter.kt @@ -12,7 +12,7 @@ import com.tangem.domain.walletconnect.usecase.method.BlockAidTransactionCheck import com.tangem.domain.walletconnect.usecase.method.WcMethodContext import com.tangem.domain.walletconnect.usecase.method.WcSignState import com.tangem.domain.walletconnect.usecase.method.WcSignStep -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.walletconnect.transaction.entity.blockaid.WcSendReceiveTransactionCheckResultsUM import com.tangem.features.walletconnect.transaction.entity.common.WcTransactionActionsUM import com.tangem.features.walletconnect.transaction.entity.common.WcTransactionFeeState diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/entity/send/WcSendTransactionUM.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/entity/send/WcSendTransactionUM.kt index 63194291e0..44d556afff 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/entity/send/WcSendTransactionUM.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/entity/send/WcSendTransactionUM.kt @@ -4,7 +4,7 @@ import com.domain.blockaid.models.transaction.ValidationResult import com.tangem.common.ui.account.AccountTitleUM import com.tangem.common.ui.notifications.NotificationUM import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfigContent -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.walletconnect.transaction.entity.approve.WcSpendAllowanceUM import com.tangem.features.walletconnect.transaction.entity.blockaid.WcSendReceiveTransactionCheckResultsUM import com.tangem.features.walletconnect.transaction.entity.common.WcCommonTransactionUM diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/model/WcSendTransactionModel.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/model/WcSendTransactionModel.kt index 89a265f09e..98ba26f87e 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/model/WcSendTransactionModel.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/model/WcSendTransactionModel.kt @@ -44,9 +44,9 @@ import com.tangem.domain.walletconnect.model.WcPsbtOutput import com.tangem.domain.walletconnect.model.WcRequestError import com.tangem.domain.walletconnect.model.WcRequestError.Companion.message import com.tangem.domain.walletconnect.usecase.method.* -import com.tangem.features.send.api.callbacks.FeeSelectorModelCallback -import com.tangem.features.send.api.entity.FeeSelectorUM -import com.tangem.features.send.api.params.FeeSelectorParams.FeeStateConfiguration +import com.tangem.features.send.api.subcomponents.feeSelector.callbacks.FeeSelectorModelCallback +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams.FeeStateConfiguration import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorReloadTrigger import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorData import com.tangem.features.walletconnect.connections.routing.WcInnerRoute diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/common/WcSendTransactionItems.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/common/WcSendTransactionItems.kt index 6a74692291..017fba171b 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/common/WcSendTransactionItems.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/common/WcSendTransactionItems.kt @@ -15,8 +15,8 @@ import com.tangem.common.ui.account.AccountTitleUM import com.tangem.core.ui.components.divider.DividerWithPadding import com.tangem.core.ui.extensions.clickableSingle import com.tangem.core.ui.res.TangemTheme -import com.tangem.features.send.api.FeeSelectorBlockComponent -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.walletconnect.transaction.entity.common.WcNetworkInfoUM import com.tangem.features.walletconnect.transaction.entity.common.WcTransactionFeeState diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/send/WcSendTransactionModalBottomSheet.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/send/WcSendTransactionModalBottomSheet.kt index 6f7f7fbff3..81d38d3315 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/send/WcSendTransactionModalBottomSheet.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/send/WcSendTransactionModalBottomSheet.kt @@ -31,8 +31,8 @@ import com.tangem.core.ui.extensions.resourceReference import com.tangem.core.ui.extensions.stringReference import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreview -import com.tangem.features.send.api.FeeSelectorBlockComponent -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.walletconnect.connections.entity.VerifiedDAppState import com.tangem.features.walletconnect.connections.ui.WcAppInfoItem import com.tangem.features.walletconnect.impl.R diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/utils/WcNotificationsFactory.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/utils/WcNotificationsFactory.kt index 1726479f92..50efc58e85 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/utils/WcNotificationsFactory.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/utils/WcNotificationsFactory.kt @@ -5,7 +5,7 @@ import com.tangem.core.ui.components.notifications.NotificationConfig import com.tangem.core.ui.extensions.resourceReference import com.tangem.core.ui.extensions.wrappedList import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils import com.tangem.features.walletconnect.impl.R import javax.inject.Inject diff --git a/gradle/tangem_dependencies.toml b/gradle/tangem_dependencies.toml index 074e02bb80..f5f4f1626b 100644 --- a/gradle/tangem_dependencies.toml +++ b/gradle/tangem_dependencies.toml @@ -5,9 +5,9 @@ # https://github.com/tangem/tangem-sdk-android/ # https://github.com/tangem/vico -tangemBlockchainSdk = "develop-1567" +tangemBlockchainSdk = "develop-1586" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds -tangemCardSdk = "develop-624" +tangemCardSdk = "develop-630" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^ tangemVico = "tangem-master-21" #tangemVico = "0.0.1" # Keep it! - used for local builds ^ diff --git a/libs/auth/src/main/java/com/tangem/lib/auth/dpop/internal/DisabledDpopProofFactory.kt b/libs/auth/src/main/java/com/tangem/lib/auth/dpop/internal/DisabledDpopProofFactory.kt index eb2242eaa5..2a94fe25e7 100644 --- a/libs/auth/src/main/java/com/tangem/lib/auth/dpop/internal/DisabledDpopProofFactory.kt +++ b/libs/auth/src/main/java/com/tangem/lib/auth/dpop/internal/DisabledDpopProofFactory.kt @@ -3,7 +3,9 @@ package com.tangem.lib.auth.dpop.internal import arrow.core.None import arrow.core.Option import com.tangem.lib.auth.dpop.DpopProofFactory +import com.tangem.utils.annotations.RemoveWithToggle +@RemoveWithToggle("AND_15438_BACKEND_AUTHENTICATION_ENABLED") internal object DisabledDpopProofFactory : DpopProofFactory { override suspend fun create(httpMethod: String, httpUri: String, accessToken: String?): Option = None diff --git a/libs/auth/src/main/java/com/tangem/lib/auth/session/AuthError.kt b/libs/auth/src/main/java/com/tangem/lib/auth/session/AuthError.kt index 2d01b7e578..cf6c367cb9 100644 --- a/libs/auth/src/main/java/com/tangem/lib/auth/session/AuthError.kt +++ b/libs/auth/src/main/java/com/tangem/lib/auth/session/AuthError.kt @@ -19,6 +19,9 @@ sealed class AuthError(open val problem: AuthErrorResponse?) { /** `404` — token / resource not found. */ data class NotFound(override val problem: AuthErrorResponse?) : AuthError(problem) + /** `409` — conflict / already exists (e.g. device or wallet already registered). */ + data class Conflict(override val problem: AuthErrorResponse?) : AuthError(problem) + /** `429` — server-side rate limit; honour [retryAfterSeconds] before retrying. */ data class RateLimited( val retryAfterSeconds: Int?, diff --git a/libs/auth/src/main/java/com/tangem/lib/auth/session/SessionRefreshError.kt b/libs/auth/src/main/java/com/tangem/lib/auth/session/SessionRefreshError.kt index 5a79eca439..2f8780035e 100644 --- a/libs/auth/src/main/java/com/tangem/lib/auth/session/SessionRefreshError.kt +++ b/libs/auth/src/main/java/com/tangem/lib/auth/session/SessionRefreshError.kt @@ -2,8 +2,8 @@ package com.tangem.lib.auth.session /** * Typed failure mode of `SessionTokenRefresher.refresh()`. Distinguishes terminal failures - * (re-registration required) from transient ones (network / server) so callers can decide - * whether to retry, surface UI, or trigger deferred-registration flow. + * (re-registration required, server-side block) from transient ones (network / server) so callers + * can decide whether to retry, surface UI, or trigger deferred-registration flow. */ sealed class SessionRefreshError { @@ -12,10 +12,18 @@ sealed class SessionRefreshError { /** * Terminal — `/authenticate` returned 401/403. Session store was cleared; the device must - * re-register ([REDACTED_TASK_KEY] / deferred-registration flow). + * re-register. */ data object SessionRevoked : SessionRefreshError() + /** + * Terminal — `/refresh` returned 403 (RED tier). The device is server-side blocked; + * `/authenticate` won't help (it would also return 403). The client should not retry within + * the current session — only attempt `/refresh` again on the next app launch, in case the + * server-side block was lifted. + */ + data object DeviceBlocked : SessionRefreshError() + /** Device key is not provisioned in Keystore (registration not yet run, or Keystore unavailable). */ data object DeviceKeyUnavailable : SessionRefreshError() diff --git a/libs/auth/src/main/java/com/tangem/lib/auth/session/SessionTokenRefresher.kt b/libs/auth/src/main/java/com/tangem/lib/auth/session/SessionTokenRefresher.kt index 8c585af554..04be67d148 100644 --- a/libs/auth/src/main/java/com/tangem/lib/auth/session/SessionTokenRefresher.kt +++ b/libs/auth/src/main/java/com/tangem/lib/auth/session/SessionTokenRefresher.kt @@ -11,12 +11,13 @@ import arrow.core.Either * * Refresh strategy: * 1. Call `/api/v1/auth/refresh` with the stored refresh token when it is present and unexpired. - * 2. On 401/403 from `/refresh` (revoked / replayed / RED-tier downgrade), fall back to - * full re-authentication via `/api/v1/auth/nonce/auth` + `/api/v1/auth/authenticate` - * signed by the device key. - * 3. On 401/403 from `/authenticate`, clear the session store and return - * [SessionRefreshError.SessionRevoked] — the device must be re-registered (see [REDACTED_TASK_KEY] - * for the deferred-registration flag). + * 2. On 401 from `/refresh` (revoked / replayed / expired refresh token), fall back to full + * re-authentication via `/api/v1/auth/nonce/auth` + `/api/v1/auth/authenticate` signed by the + * device key. + * 3. On 403 from `/refresh` (RED tier — device blocked server-side), return + * [SessionRefreshError.DeviceBlocked] without trying `/authenticate` (it would also 403). + * 4. On 401/403 from `/authenticate`, clear the session store and return + * [SessionRefreshError.SessionRevoked] — the device must be re-registered. */ interface SessionTokenRefresher { diff --git a/libs/auth/src/main/java/com/tangem/lib/auth/session/internal/AuthErrorConverter.kt b/libs/auth/src/main/java/com/tangem/lib/auth/session/internal/AuthErrorConverter.kt index 6e9ec92012..117912dbc0 100644 --- a/libs/auth/src/main/java/com/tangem/lib/auth/session/internal/AuthErrorConverter.kt +++ b/libs/auth/src/main/java/com/tangem/lib/auth/session/internal/AuthErrorConverter.kt @@ -35,6 +35,7 @@ internal class AuthErrorConverter @Inject constructor() : Converter AuthError.Unauthorized(problem) Code.FORBIDDEN -> AuthError.Forbidden(problem) Code.NOT_FOUND -> AuthError.NotFound(problem) + Code.CONFLICT -> AuthError.Conflict(problem) Code.TOO_MANY_REQUESTS -> AuthError.RateLimited(problem?.retryAfterSeconds, problem) else -> if (error.isServerError()) AuthError.ServerUnavailable(problem) else AuthError.Unknown(error) } diff --git a/libs/auth/src/main/java/com/tangem/lib/auth/session/internal/DefaultDeviceRegistrar.kt b/libs/auth/src/main/java/com/tangem/lib/auth/session/internal/DefaultDeviceRegistrar.kt index 44abb0afb4..af14515777 100644 --- a/libs/auth/src/main/java/com/tangem/lib/auth/session/internal/DefaultDeviceRegistrar.kt +++ b/libs/auth/src/main/java/com/tangem/lib/auth/session/internal/DefaultDeviceRegistrar.kt @@ -1,11 +1,13 @@ package com.tangem.lib.auth.session.internal import arrow.core.Either +import arrow.core.raise.Raise import arrow.core.raise.either import com.tangem.datasource.api.auth.AuthApi import com.tangem.datasource.api.auth.models.request.NonceApiRequest import com.tangem.datasource.api.auth.models.request.RegisterApiRequest import com.tangem.datasource.api.auth.models.request.RegisterPayload +import com.tangem.datasource.api.auth.models.response.TokenApiResponse import com.tangem.datasource.api.common.response.ApiResponse import com.tangem.datasource.local.preferences.AppPreferencesStore import com.tangem.datasource.local.preferences.PreferencesKeys @@ -13,6 +15,7 @@ import com.tangem.datasource.local.preferences.utils.getSyncOrDefault import com.tangem.datasource.local.preferences.utils.store import com.tangem.lib.auth.devicekey.DeviceKeyManager import com.tangem.lib.auth.nonce.AuthNonceDecryptor +import com.tangem.lib.auth.session.AuthError import com.tangem.lib.auth.session.DeviceRegistrar import com.tangem.lib.auth.session.DeviceRegistrationError import com.tangem.lib.auth.session.SessionTokensStore @@ -89,10 +92,16 @@ internal class DefaultDeviceRegistrar( raise(DeviceRegistrationError.SigningFailed(e)) } - val registerResponse = authApi.register(RegisterApiRequest(payload = payload, signature = signature)) - when (registerResponse) { + val registerResponse = authApi.registerDevice(RegisterApiRequest(payload = payload, signature = signature)) + handleRegisterResponse(registerResponse) + } + + private suspend fun Raise.handleRegisterResponse( + response: ApiResponse, + ) { + when (response) { is ApiResponse.Success -> { - val tokens = SessionTokensConverter.convertBack(registerResponse.data) + val tokens = SessionTokensConverter.convertBack(response.data) try { // Keep both writes inside one catch — if the second one fails, the flag stays // `false` and the next launch retries cleanly. Worst case: tokens are persisted @@ -106,10 +115,27 @@ internal class DefaultDeviceRegistrar( TangemLogger.i("Device registered successfully") } is ApiResponse.Error -> { - val authError = errorConverter.convert(registerResponse.cause) + val authError = errorConverter.convert(response.cause) + if (authError is AuthError.Conflict) { + // Device is already registered server-side (e.g. the local flag was lost on + // reinstall). Persist the flag to stop retrying; session tokens will be minted + // on demand via /authenticate. + TangemLogger.i("Device already registered server-side (409) — marking as registered") + markRegistered(onFailureLog = "Failed to persist device-registration flag after 409") + return + } TangemLogger.e("/register request failed: $authError") raise(DeviceRegistrationError.Api(authError)) } } } + + private suspend fun Raise.markRegistered(onFailureLog: String) { + try { + appPreferencesStore.store(key = PreferencesKeys.IS_DEVICE_REGISTERED_KEY, value = true) + } catch (e: Exception) { + TangemLogger.e(onFailureLog, e) + raise(DeviceRegistrationError.PersistenceFailed(e)) + } + } } \ No newline at end of file diff --git a/libs/auth/src/main/java/com/tangem/lib/auth/session/internal/DefaultSessionTokenRefresher.kt b/libs/auth/src/main/java/com/tangem/lib/auth/session/internal/DefaultSessionTokenRefresher.kt index 3357b50e06..17e2eff7c9 100644 --- a/libs/auth/src/main/java/com/tangem/lib/auth/session/internal/DefaultSessionTokenRefresher.kt +++ b/libs/auth/src/main/java/com/tangem/lib/auth/session/internal/DefaultSessionTokenRefresher.kt @@ -9,7 +9,6 @@ import com.tangem.datasource.api.auth.models.request.AuthApiRequest import com.tangem.datasource.api.auth.models.request.AuthenticationPayload import com.tangem.datasource.api.auth.models.request.NonceApiRequest import com.tangem.datasource.api.auth.models.request.RefreshApiRequest -import com.tangem.datasource.api.auth.models.response.TokenApiResponse import com.tangem.datasource.api.common.response.ApiResponse import com.tangem.lib.auth.devicekey.DeviceKeyManager import com.tangem.lib.auth.nonce.AuthNonceDecryptor @@ -55,10 +54,17 @@ internal class DefaultSessionTokenRefresher( } if (isOwner) { + TangemLogger.i("Session refresh started (owner)") try { - deferred.complete(runRefresh(current = store.get().getOrNull())) + val outcome = runRefresh(current = store.get().getOrNull()) + outcome.fold( + ifLeft = { TangemLogger.e("Session refresh finished with error: $it") }, + ifRight = { TangemLogger.i("Session refresh finished successfully") }, + ) + deferred.complete(outcome) } catch (t: Throwable) { // Propagate to every waiter — without this they'd suspend forever on `await()`. + TangemLogger.e("Session refresh threw; propagating to waiters", t) deferred.completeExceptionally(t) throw t } finally { @@ -68,6 +74,8 @@ internal class DefaultSessionTokenRefresher( mutex.withLock { inFlight = null } } } + } else { + TangemLogger.i("Session refresh already in-flight — joining as waiter") } deferred.await() @@ -78,11 +86,31 @@ internal class DefaultSessionTokenRefresher( val isRefreshTokenValid = current?.refreshTokenExpiresAt != null && current.refreshTokenExpiresAt > now if (current?.refreshToken != null && isRefreshTokenValid) { + TangemLogger.i("Calling /refresh with stored refresh token") when (val result = callRefresh(current.refreshToken)) { - is RefreshOutcome.Success -> return result.tokens.right() - RefreshOutcome.Unauthenticated -> Unit // fall through to /authenticate - is RefreshOutcome.Transient -> return SessionRefreshError.Api(result.cause).left() + is RefreshOutcome.Success -> { + store.save(result.tokens) + TangemLogger.i("/refresh succeeded; session tokens persisted") + return result.tokens.right() + } + // 401: refresh token is invalid/expired/revoked/replayed but the device key is + // intact server-side → fall back to /authenticate to mint a new pair. + RefreshOutcome.RefreshTokenInvalid -> { + TangemLogger.i("/refresh returned 401 — falling back to /authenticate") + } + // 403: device is blocked server-side (RED tier). `/authenticate` would also 403, + // so don't waste the call — surface the terminal state and let the caller bail. + RefreshOutcome.DeviceBlocked -> { + TangemLogger.e("/refresh returned 403 — device is blocked server-side (terminal)") + return SessionRefreshError.DeviceBlocked.left() + } + is RefreshOutcome.Transient -> { + TangemLogger.e("/refresh failed with transient error: ${result.cause}") + return SessionRefreshError.Api(result.cause).left() + } } + } else { + TangemLogger.i("No valid refresh token in store — proceeding directly to /authenticate") } return runAuthenticate() @@ -90,10 +118,19 @@ internal class DefaultSessionTokenRefresher( private suspend fun callRefresh(refreshToken: String): RefreshOutcome { val response = authApi.refresh(RefreshApiRequest(refreshToken = refreshToken)) - return handleTokenResponse(response, clearOnUnauthenticated = false) + return when (response) { + is ApiResponse.Success -> RefreshOutcome.Success(SessionTokensConverter.convertBack(response.data)) + is ApiResponse.Error -> when (val authError = errorConverter.convert(response.cause)) { + is AuthError.Unauthorized -> RefreshOutcome.RefreshTokenInvalid + is AuthError.Forbidden -> RefreshOutcome.DeviceBlocked + else -> RefreshOutcome.Transient(authError) + } + } } private suspend fun runAuthenticate(): Either = either { + TangemLogger.i("Starting /authenticate") + val devicePublicKey = deviceKeyManager.getPublicKey().getOrNull() ?: raise(SessionRefreshError.DeviceKeyUnavailable) @@ -104,6 +141,7 @@ internal class DefaultSessionTokenRefresher( is ApiResponse.Success -> nonceResponse.data.cipheredNonce is ApiResponse.Error -> { val authError = errorConverter.convert(nonceResponse.cause) + TangemLogger.e("/nonce/auth request failed: $authError") raise(SessionRefreshError.Api(authError)) } } @@ -129,33 +167,25 @@ internal class DefaultSessionTokenRefresher( } val authResponse = authApi.authenticate(AuthApiRequest(payload = payload, signature = signature)) - return when (val outcome = handleTokenResponse(authResponse, clearOnUnauthenticated = true)) { - is RefreshOutcome.Success -> outcome.tokens.right() - RefreshOutcome.Unauthenticated -> SessionRefreshError.SessionRevoked.left() - is RefreshOutcome.Transient -> SessionRefreshError.Api(outcome.cause).left() - } - } - - private suspend fun handleTokenResponse( - response: ApiResponse, - clearOnUnauthenticated: Boolean, - ): RefreshOutcome { - return when (response) { + when (authResponse) { is ApiResponse.Success -> { - val tokens = SessionTokensConverter.convertBack(response.data) + val tokens = SessionTokensConverter.convertBack(authResponse.data) store.save(tokens) - RefreshOutcome.Success(tokens) + TangemLogger.i("/authenticate succeeded; session tokens persisted") + tokens } is ApiResponse.Error -> { - when (val authError = errorConverter.convert(response.cause)) { + val authError = errorConverter.convert(authResponse.cause) + when (authError) { is AuthError.Unauthorized, is AuthError.Forbidden -> { - if (clearOnUnauthenticated) { - TangemLogger.i("Session revoked: ${authError.problem?.detail ?: authError}") - store.clear() - } - RefreshOutcome.Unauthenticated + TangemLogger.i("Session revoked: ${authError.problem?.detail ?: authError}") + store.clear() + raise(SessionRefreshError.SessionRevoked) + } + else -> { + TangemLogger.e("/authenticate request failed: $authError") + raise(SessionRefreshError.Api(authError)) } - else -> RefreshOutcome.Transient(authError) } } } @@ -163,7 +193,8 @@ internal class DefaultSessionTokenRefresher( private sealed interface RefreshOutcome { data class Success(val tokens: SessionTokens) : RefreshOutcome - data object Unauthenticated : RefreshOutcome + data object RefreshTokenInvalid : RefreshOutcome + data object DeviceBlocked : RefreshOutcome data class Transient(val cause: AuthError) : RefreshOutcome } } \ No newline at end of file diff --git a/libs/auth/src/main/java/com/tangem/lib/auth/session/internal/DisabledDeviceRegistrar.kt b/libs/auth/src/main/java/com/tangem/lib/auth/session/internal/DisabledDeviceRegistrar.kt index 6b6dee0459..4e25661427 100644 --- a/libs/auth/src/main/java/com/tangem/lib/auth/session/internal/DisabledDeviceRegistrar.kt +++ b/libs/auth/src/main/java/com/tangem/lib/auth/session/internal/DisabledDeviceRegistrar.kt @@ -4,7 +4,9 @@ import arrow.core.Either import arrow.core.left import com.tangem.lib.auth.session.DeviceRegistrar import com.tangem.lib.auth.session.DeviceRegistrationError +import com.tangem.utils.annotations.RemoveWithToggle +@RemoveWithToggle("AND_15438_BACKEND_AUTHENTICATION_ENABLED") internal object DisabledDeviceRegistrar : DeviceRegistrar { override suspend fun register(): Either { diff --git a/libs/auth/src/main/java/com/tangem/lib/auth/session/internal/SignedRequestPayload.kt b/libs/auth/src/main/java/com/tangem/lib/auth/session/internal/SignedRequestPayload.kt index beecbe578f..51bf498bca 100644 --- a/libs/auth/src/main/java/com/tangem/lib/auth/session/internal/SignedRequestPayload.kt +++ b/libs/auth/src/main/java/com/tangem/lib/auth/session/internal/SignedRequestPayload.kt @@ -17,7 +17,7 @@ internal class SignedRequestPayload @Inject constructor( private val appInfoProvider: AppInfoProvider, ) { - /** Snapshot of [appInfoProvider]'s device facts as the network DTO. `userAgent` is intentionally null. */ + /** Snapshot of [appInfoProvider]'s device facts as the network DTO. */ val deviceMetadata: DeviceMetadata get() = DeviceMetadata( deviceModel = appInfoProvider.device, @@ -25,7 +25,7 @@ internal class SignedRequestPayload @Inject constructor( os = appInfoProvider.platform.lowercase(), osVersion = appInfoProvider.osVersion, appVersion = appInfoProvider.appVersion, - userAgent = null, + userAgent = with(appInfoProvider) { "Tangem/$appVersion ($device; $platform $osVersion)" }, locale = appInfoProvider.language, timezone = appInfoProvider.timezone, ) @@ -49,9 +49,7 @@ internal class SignedRequestPayload @Inject constructor( /** * Stable, newline-separated representation of the signed payload. Backend treats the bytes * opaquely; must stay aligned with the server-side canonicalisation. Field order matches the - * declaration order of [RegisterPayload] / [AuthenticationPayload], with one exception: - * [DeviceMetadata.userAgent] is intentionally NOT included in the signed bytes (it's always - * `null` in [deviceMetadata] and the server doesn't sign it either). + * declaration order of [RegisterPayload] / [AuthenticationPayload] and [DeviceMetadata]. */ private fun canonicalize( devicePublicKey: String, @@ -62,12 +60,13 @@ internal class SignedRequestPayload @Inject constructor( append(devicePublicKey).append('\n') append(nonce).append('\n') append(attestationToken.orEmpty()).append('\n') - append(metadata.deviceModel.orEmpty()).append('\n') + append(metadata.deviceModel).append('\n') append(metadata.os).append('\n') - append(metadata.osVersion.orEmpty()).append('\n') - append(metadata.appVersion.orEmpty()).append('\n') - append(metadata.locale.orEmpty()).append('\n') - append(metadata.timezone.orEmpty()) + append(metadata.osVersion).append('\n') + append(metadata.appVersion).append('\n') + append(metadata.userAgent).append('\n') + append(metadata.locale).append('\n') + append(metadata.timezone) }.toByteArray(Charsets.UTF_8) } diff --git a/libs/auth/src/test/java/com/tangem/lib/auth/session/internal/AuthErrorConverterTest.kt b/libs/auth/src/test/java/com/tangem/lib/auth/session/internal/AuthErrorConverterTest.kt index 6e782c6df0..b9d720db27 100644 --- a/libs/auth/src/test/java/com/tangem/lib/auth/session/internal/AuthErrorConverterTest.kt +++ b/libs/auth/src/test/java/com/tangem/lib/auth/session/internal/AuthErrorConverterTest.kt @@ -71,6 +71,14 @@ class AuthErrorConverterTest { assertThat(result).isInstanceOf(AuthError.NotFound::class.java) } + @Test + fun `409 is converted to Conflict`() { + val result = converter.convert(httpError(Code.CONFLICT, sampleBody)) + + assertThat(result).isInstanceOf(AuthError.Conflict::class.java) + assertThat((result as AuthError.Conflict).problem).isEqualTo(sampleProblem) + } + @Test fun `429 surfaces retryAfterSeconds from problem`() { val rateLimitBody = """ diff --git a/libs/auth/src/test/java/com/tangem/lib/auth/session/internal/DefaultDeviceRegistrarTest.kt b/libs/auth/src/test/java/com/tangem/lib/auth/session/internal/DefaultDeviceRegistrarTest.kt index ebf0d14a60..b523254315 100644 --- a/libs/auth/src/test/java/com/tangem/lib/auth/session/internal/DefaultDeviceRegistrarTest.kt +++ b/libs/auth/src/test/java/com/tangem/lib/auth/session/internal/DefaultDeviceRegistrarTest.kt @@ -9,7 +9,6 @@ import arrow.core.Some import com.google.common.truth.Truth.assertThat import com.squareup.moshi.Moshi import com.tangem.datasource.api.auth.AuthApi -import com.tangem.datasource.api.auth.models.request.NonceApiRequest import com.tangem.datasource.api.auth.models.request.RegisterApiRequest import com.tangem.datasource.api.auth.models.response.NonceApiResponse import com.tangem.datasource.api.auth.models.response.TokenApiResponse @@ -89,7 +88,7 @@ class DefaultDeviceRegistrarTest { assertThat(result.isRight()).isTrue() coVerify { authApi.requestDeviceNonce(any()) } - coVerify { authApi.register(any()) } + coVerify { authApi.registerDevice(any()) } coVerify { store.save(any()) } assertThat(preferencesDataStore.current()[PreferencesKeys.IS_DEVICE_REGISTERED_KEY]).isTrue() } @@ -102,7 +101,7 @@ class DefaultDeviceRegistrarTest { assertThat(result.isRight()).isTrue() coVerify(exactly = 0) { authApi.requestDeviceNonce(any()) } - coVerify(exactly = 0) { authApi.register(any()) } + coVerify(exactly = 0) { authApi.registerDevice(any()) } coVerify(exactly = 0) { store.save(any()) } } @@ -114,7 +113,7 @@ class DefaultDeviceRegistrarTest { assertThat(result.leftOrNull()).isEqualTo(DeviceRegistrationError.DeviceKeyUnavailable) coVerify(exactly = 0) { authApi.requestDeviceNonce(any()) } - coVerify(exactly = 0) { authApi.register(any()) } + coVerify(exactly = 0) { authApi.registerDevice(any()) } assertThat(preferencesDataStore.current()[PreferencesKeys.IS_DEVICE_REGISTERED_KEY]).isNull() } @@ -133,7 +132,7 @@ class DefaultDeviceRegistrarTest { val result = registrar.register() assertThat(result.leftOrNull()).isInstanceOf(DeviceRegistrationError.Api::class.java) - coVerify(exactly = 0) { authApi.register(any()) } + coVerify(exactly = 0) { authApi.registerDevice(any()) } assertThat(preferencesDataStore.current()[PreferencesKeys.IS_DEVICE_REGISTERED_KEY]).isNull() } @@ -148,7 +147,7 @@ class DefaultDeviceRegistrarTest { val result = registrar.register() assertThat(result.leftOrNull()).isInstanceOf(DeviceRegistrationError.NonceDecryptionFailed::class.java) - coVerify(exactly = 0) { authApi.register(any()) } + coVerify(exactly = 0) { authApi.registerDevice(any()) } } @Test @@ -163,7 +162,7 @@ class DefaultDeviceRegistrarTest { val result = registrar.register() assertThat(result.leftOrNull()).isInstanceOf(DeviceRegistrationError.SigningFailed::class.java) - coVerify(exactly = 0) { authApi.register(any()) } + coVerify(exactly = 0) { authApi.registerDevice(any()) } } @Test @@ -175,7 +174,7 @@ class DefaultDeviceRegistrarTest { coEvery { nonceDecryptor.decryptNonce("abc") } returns "decrypted" coEvery { deviceKeyManager.sign(any()) } returns ByteArray(64) @Suppress("UNCHECKED_CAST") - coEvery { authApi.register(any()) } returns ApiResponse.Error( + coEvery { authApi.registerDevice(any()) } returns ApiResponse.Error( cause = ApiResponseError.HttpException( code = ApiResponseError.HttpException.Code.FORBIDDEN, message = "already registered", @@ -190,6 +189,31 @@ class DefaultDeviceRegistrarTest { assertThat(preferencesDataStore.current()[PreferencesKeys.IS_DEVICE_REGISTERED_KEY]).isNull() } + @Test + fun `register treats 409 Conflict as success, sets flag without persisting tokens`() = runTest { + coEvery { deviceKeyManager.getPublicKey() } returns Some(ByteArray(65)) + coEvery { authApi.requestDeviceNonce(any()) } returns ApiResponse.Success( + data = NonceApiResponse(cipheredNonce = "abc", expiresAt = "2024-01-01T00:00:00Z"), + ) + coEvery { nonceDecryptor.decryptNonce("abc") } returns "decrypted" + coEvery { deviceKeyManager.sign(any()) } returns ByteArray(64) + @Suppress("UNCHECKED_CAST") + coEvery { authApi.registerDevice(any()) } returns ApiResponse.Error( + cause = ApiResponseError.HttpException( + code = ApiResponseError.HttpException.Code.CONFLICT, + message = "device already registered", + errorBody = null, + ), + ) as ApiResponse + + val result = registrar.register() + + // Device is already registered server-side — no error, flag set, but no tokens minted here. + assertThat(result.isRight()).isTrue() + assertThat(preferencesDataStore.current()[PreferencesKeys.IS_DEVICE_REGISTERED_KEY]).isTrue() + coVerify(exactly = 0) { store.save(any()) } + } + @Test fun `register returns PersistenceFailed when SessionTokensStore_save throws`() = runTest { stubHappyPath() @@ -209,7 +233,7 @@ class DefaultDeviceRegistrarTest { ) coEvery { nonceDecryptor.decryptNonce("abc") } returns "decrypted" coEvery { deviceKeyManager.sign(any()) } returns ByteArray(64) - coEvery { authApi.register(any()) } returns ApiResponse.Success( + coEvery { authApi.registerDevice(any()) } returns ApiResponse.Success( data = TokenApiResponse( accessToken = "fresh-access", accessTokenExpiresAt = "2024-01-01T00:00:00Z", diff --git a/libs/auth/src/test/java/com/tangem/lib/auth/session/internal/DefaultSessionTokenRefresherTest.kt b/libs/auth/src/test/java/com/tangem/lib/auth/session/internal/DefaultSessionTokenRefresherTest.kt index f5263ea5b4..7bc6838580 100644 --- a/libs/auth/src/test/java/com/tangem/lib/auth/session/internal/DefaultSessionTokenRefresherTest.kt +++ b/libs/auth/src/test/java/com/tangem/lib/auth/session/internal/DefaultSessionTokenRefresherTest.kt @@ -102,6 +102,7 @@ class DefaultSessionTokenRefresherTest { assertThat(tokens.refreshToken).isEqualTo("rt-2") assertThat(tokens.walletIds).containsExactly("w1", "w2") coVerify { store.save(tokens) } + coVerify(exactly = 0) { authApi.authenticate(any()) } } @Test @@ -133,6 +134,34 @@ class DefaultSessionTokenRefresherTest { coVerify { authApi.authenticate(any()) } } + @Test + fun `refresh returns DeviceBlocked when refresh returns 403 — does not call authenticate`() = runTest { + val stored = SessionTokens( + accessToken = "old-access", + accessTokenExpiresAt = fixedClock.now().plus(60), + refreshToken = "rt-1", + refreshTokenExpiresAt = fixedClock.now().plus(3600), + walletIds = listOf("w1"), + ) + coEvery { store.get() } returns Some(stored) + @Suppress("UNCHECKED_CAST") + coEvery { authApi.refresh(any()) } returns ApiResponse.Error( + cause = ApiResponseError.HttpException( + code = ApiResponseError.HttpException.Code.FORBIDDEN, + message = "RED tier", + errorBody = null, + ), + ) as ApiResponse + + val result = refresher.refresh() + + // 403 means device is server-side blocked; /authenticate would also fail with 403. + // Don't fall through. + assertThat(result.leftOrNull()).isEqualTo(SessionRefreshError.DeviceBlocked) + coVerify(exactly = 0) { authApi.requestAuthNonce(any()) } + coVerify(exactly = 0) { authApi.authenticate(any()) } + } + @Test fun `refresh clears store when authenticate returns 403`() = runTest { coEvery { store.get() } returns None @@ -159,6 +188,17 @@ class DefaultSessionTokenRefresherTest { coVerify { store.clear() } } + @Test + fun `refresh returns DeviceKeyUnavailable when authenticate fallback has no key`() = runTest { + coEvery { store.get() } returns None + coEvery { deviceKeyManager.getPublicKey() } returns None + + val result = refresher.refresh() + + assertThat(result.leftOrNull()).isEqualTo(SessionRefreshError.DeviceKeyUnavailable) + coVerify(exactly = 0) { authApi.requestAuthNonce(any()) } + } + @Test fun `concurrent callers share a single refresh round-trip — both get same result`() = runTest { val stored = SessionTokens( diff --git a/libs/auth/src/test/java/com/tangem/lib/auth/session/internal/SignedRequestPayloadTest.kt b/libs/auth/src/test/java/com/tangem/lib/auth/session/internal/SignedRequestPayloadTest.kt index 6c83b8845d..5b7fba6f0e 100644 --- a/libs/auth/src/test/java/com/tangem/lib/auth/session/internal/SignedRequestPayloadTest.kt +++ b/libs/auth/src/test/java/com/tangem/lib/auth/session/internal/SignedRequestPayloadTest.kt @@ -25,7 +25,7 @@ class SignedRequestPayloadTest { private val signedRequestPayload = SignedRequestPayload(appInfoProvider) @Test - fun `deviceMetadata wires AppInfoProvider fields, forces userAgent to null, lowercases platform`() { + fun `deviceMetadata wires AppInfoProvider fields, builds userAgent, lowercases platform`() { val metadata = signedRequestPayload.deviceMetadata // Backend contract is lowercase `android`/`ios` — verify normalization at the source. @@ -35,7 +35,7 @@ class SignedRequestPayloadTest { os = "android", osVersion = "14", appVersion = "5.40.0", - userAgent = null, + userAgent = "Tangem/5.40.0 (Pixel 8; Android 14)", locale = "en-US", timezone = "Europe/Moscow", ), @@ -49,7 +49,7 @@ class SignedRequestPayloadTest { os = "Android", osVersion = "14", appVersion = "5.40.0", - userAgent = null, + userAgent = "Tangem/5.40.0 (Pixel 8; Android 14)", locale = "en-US", timezone = "Europe/Moscow", ) @@ -71,6 +71,7 @@ class SignedRequestPayloadTest { Android 14 5.40.0 + Tangem/5.40.0 (Pixel 8; Android 14) en-US Europe/Moscow """.trimIndent(), @@ -78,15 +79,15 @@ class SignedRequestPayloadTest { } @Test - fun `canonicalize replaces null fields with empty string`() { + fun `canonicalize replaces null attestationToken with empty string`() { val metadata = DeviceMetadata( - deviceModel = null, + deviceModel = "Pixel 8", os = "Android", - osVersion = null, - appVersion = null, - userAgent = null, - locale = null, - timezone = null, + osVersion = "14", + appVersion = "5.40.0", + userAgent = "Tangem/5.40.0 (Pixel 8; Android 14)", + locale = "en-US", + timezone = "Europe/Moscow", ) val payload = RegisterPayload( devicePublicKey = "pub", @@ -97,8 +98,10 @@ class SignedRequestPayloadTest { val bytes = signedRequestPayload.canonicalize(payload) - // 8 newlines separate 9 logical slots; all but `devicePublicKey`, `nonce`, and `os` are empty. - assertThat(bytes.toString(Charsets.UTF_8)).isEqualTo("pub\nnonce-1\n\n\nAndroid\n\n\n\n") + // The null attestationToken collapses to an empty slot between `nonce` and `deviceModel`. + assertThat(bytes.toString(Charsets.UTF_8)).isEqualTo( + "pub\nnonce-1\n\nPixel 8\nAndroid\n14\n5.40.0\nTangem/5.40.0 (Pixel 8; Android 14)\nen-US\nEurope/Moscow", + ) } @Test @@ -110,7 +113,7 @@ class SignedRequestPayloadTest { os = "Android", osVersion = "14", appVersion = "5.40.0", - userAgent = null, + userAgent = "Tangem/5.40.0 (Pixel 8; Android 14)", locale = "en-US", timezone = "Europe/Moscow", ) diff --git a/settings.gradle.kts b/settings.gradle.kts index b61afb33b1..b1fabd1412 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -439,6 +439,7 @@ include(":domain:search") // region Data modules include(":data:account") +include(":data:address-book") include(":data:app-currency") include(":data:app-theme") include(":data:balance-hiding")