Skip to content

Feat/issues 562 563 entity management pause subscription#662

Merged
Ebuka321 merged 2 commits into
Smartdevs17:mainfrom
Chuks-coderr:feat/issues-562-563-entity-management-pause-subscription
Jun 28, 2026
Merged

Feat/issues 562 563 entity management pause subscription#662
Ebuka321 merged 2 commits into
Smartdevs17:mainfrom
Chuks-coderr:feat/issues-562-563-entity-management-pause-subscription

Conversation

@Chuks-coderr

Copy link
Copy Markdown
Contributor

Pull Request Checklist

Quality Gates (All must pass before merge)

  • Lint: Code passes ESLint and Prettier checks
  • Type Check: TypeScript compilation succeeds
  • Tests: All tests pass
  • Build: Project builds successfully
  • Rust Format: Smart contract formatting is correct
  • Rust Clippy: Smart contract linting passes
  • Rust Tests: All smart contract tests pass
  • Rust Build: Smart contracts compile successfully

Additional Requirements

  • New code has appropriate TypeScript types
  • No hardcoded secrets or credentials
  • New features have corresponding tests
  • Documentation updated if needed

Reviewers

  • At least 1 approval required for merge
  • All CI checks must be green

This PR will not be mergeable until all quality gates pass.
closes
closes #562
closes #563

…pause (Smartdevs17#563)

Issue Smartdevs17#562 – Multi-entity/brand management:
- src/types/entity.ts: Entity hierarchy types, roles, consolidated invoice, merge/divest results
- src/store/entityStore.ts: EntityService (pure fns) + Zustand store with createEntity,
  mergeEntities, divestitureEntity, computeEntityAnalytics, buildConsolidatedInvoice
- src/screens/EntityManagementScreen.tsx: UI for parent/child entity tree, add/remove,
  merge (acquisition), divest, member role management

Issue Smartdevs17#563 – Subscription holiday/vacation pause:
- src/types/pause.ts: PauseState machine, PauseLimits, PauseRecord, PausePreview types
- src/store/pauseStore.ts: ProrationCalculator + PauseService (validatePauseRequest,
  initiatePause, resumePause, expireCredit) + Zustand store; max 2 pauses/year, 7-90 days
- src/screens/PauseSubscriptionScreen.tsx: UI with duration picker, reason selector,
  credit preview, early resume, pause history

Navigation:
- src/navigation/types.ts: EntityManagement and PauseSubscription routes added
- src/navigation/AppNavigator.tsx: lazy screens registered in HomeStack + SettingsStack

Chore:
- .gitignore: add Rust target/, Python __pycache__, jest-results, copy file patterns
@drips-wave

drips-wave Bot commented Jun 25, 2026

Copy link
Copy Markdown

@Chuks-coderr Great news! 🎉 Based on an automated assessment of this PR, the linked Wave issue(s) no longer count against your application limits.

You can now already apply to more issues while waiting for a review of this PR. Keep up the great work! 🚀

Learn more about application limits

@gitguardian

gitguardian Bot commented Jun 28, 2026

Copy link
Copy Markdown

⚠️ GitGuardian has uncovered 1 secret following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

Since your pull request originates from a forked repository, GitGuardian is not able to associate the secrets uncovered with secret incidents on your GitGuardian dashboard.
Skipping this check run and merging your pull request will create secret incidents on your GitGuardian dashboard.

🔎 Detected hardcoded secret in your pull request
GitGuardian id GitGuardian status Secret Commit Filename
34266369 Triggered Generic Password 7b9befb backend/config/tests/redis.test.ts View secret
🛠 Guidelines to remediate hardcoded secrets
  1. Understand the implications of revoking this secret by investigating where it is used in your code.
  2. Replace and store your secret safely. Learn here the best practices.
  3. Revoke and rotate this secret.
  4. If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.

To avoid such incidents in the future consider


🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

@Ebuka321 Ebuka321 merged commit f8a076d into Smartdevs17:main Jun 28, 2026
7 of 31 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add subscription holiday/vacation pause with prorated credits Build multi-entity/brand management with consolidated billing

2 participants