Feature/issue 362 dispute form#391
Closed
OAKVISUALZ wants to merge 5 commits into
Closed
Conversation
|
Someone is attempting to deploy a commit to the Emmanuel Dorcas' projects Team on Vercel. A member of the Team first needs to authorize it. |
Contributor
|
This PR has merge conflicts. Please rebase on latest |
Contributor
|
This PR has extensive merge conflicts with |
Resolved 18 conflicting files: - package.json: merged all scripts (test:ui, test:watch, storybook) and all deps from both branches (zod+yup, @hookform/resolvers, @formatjs, vite, msw, @vitest/browser-playwright) - package-lock.json: accepted upstream/v2 version - next.config.ts: merged withPWAInit (feature) + withNextIntl with explicit i18n path + PWA export chain - vitest.config.ts: kept feature branch's full config (storybook, playwright, coverage) + added upstream's next/navigation stubs - app/layout.tsx: combined all providers: NextIntlClientProvider + ThemeProvider + TooltipProvider with all 4 fonts in body className - app/(admin)/admin/analytics/page.tsx: merged variable names, kept AdminMetricCardsSkeleton + AdminMetricCard grid from upstream - app/(admin)/admin/users/page.tsx: merged imports, removed duplicate selectedIds declaration, kept loadUsers useCallback pattern - app/(dashboard)/dashboard/page.tsx: kept feature branch's full WidgetCustomizer + withdrawal store implementation - app/(dashboard)/transactions/page.tsx: kept URL-param-based state + Suspense wrapper + TransactionTableSkeleton + offline notice - app/api/proxy/[...path]/route.ts: kept upstream's multi-line token if-block (minor style difference) - components/admin/UserDetailPanel.tsx: kept feature branch's richer implementation with deleteAdminUser, updateUserKyc, offline notice - components/dashboard/convert/convert-form.tsx: kept feature branch's rate-lock flow with lockExchangeRate + countdown timer - components/dashboard/transaction-detail-modal.tsx: kept dispute form modal + AlertCircle for dispute status + haptics on copy - components/dashboard/withdrawal/WithdrawalForm.tsx: kept upstream's cleaner div-based form with currenciesUnavailable + aria attributes - components/shared/language-switcher.tsx: kept feature branch's cookie-based impl + added upstream's ha/yo/ig locales - lib/api/admin.ts: kept both PushNotification and Announcement types (serve different admin pages) - lib/api/transactions.ts: kept feature's CreateSwapDto (lockId + amount:string) and raiseDispute function; removed duplicate stale implementations - lib/utils/export.ts: kept upstream's full jsPDF utilities + merged feature branch's typed exportTransactionsToCsv(AdminTransaction[])
|
@OAKVISUALZ 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! 🚀 |
Author
|
The merge conflicts have been resolved. Could you please authorize the Vercel preview deployment? Thank you! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #362
📌 Pull Request Title
📋 Description
🛠 Changes Implemented
✅ How to Test
🔍 Screenshots (if applicable)
🚀 Checklist
🔗 Related Issues