fix: repair merge-corrupted files and restore CI - #580
Merged
Austinaminu2 merged 1 commit intoAug 24, 2026
Merged
Conversation
Several files had duplicate/interleaved code left behind by bad merges that broke tsc, npm test, and npm run build: - lib/stellar.ts: missing closing brace between two functions - app/error.tsx: two competing error-parsing helpers spliced together - components/layout/testnet-faucet-banner.tsx: two full component implementations concatenated; kept the current Friendbot-funding version - app/app/analytics/page.tsx and components/analytics/charts.tsx: reconstructed from git history, replaying the legitimate SECONDS_PER_DAY and per-token-decimals fixes onto the last known-good version and dropping dead code pulled in by mistake Also fixed several stale/broken tests uncovered once these files could compile again: - Deleted __tests__/hooks/use-bulk-actions.test.ts and use-bulk-select.test.ts, which tested hooks deliberately deleted as dead code long before a stale PR re-added tests for them - Fixed missing TokenInfo.address / StreamData.linearAmount+duration fields, a missing afterEach import, and a nonexistent toEndWith matcher in test fixtures - Updated webhook-settings tests to check the inline field errors the component renders now instead of the toast calls it used before a later, deliberate UX fix - Fixed a real bug in useTokenPrice/usePortfolioValue: an empty stream list returned totalUsd=null instead of 0, and the price cache's error fallback never actually restored the last known-good price into a new component instance - Fixed module-level price-cache leakage between tests via vi.resetModules() + dynamic import, matching the existing pattern used elsewhere in this repo - Fixed flaky act()/fake-timer interactions in use-auto-withdraw and use-contract tests Also documented NEXT_PUBLIC_STELLAR_NETWORK in .env.local.example and DEPLOYMENT.md, which picks the network but was previously undocumented.
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
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.
Summary
tsc,npm test, andnpm run build:lib/stellar.ts— missing closing brace between two functionsapp/error.tsx— two competing error-parsing helpers spliced togethercomponents/layout/testnet-faucet-banner.tsx— two full component implementations concatenated; kept the current Friendbot-funding versionapp/app/analytics/page.tsxandcomponents/analytics/charts.tsx— reconstructed from git history by replaying the legitimateSECONDS_PER_DAYand per-token-decimals fixes onto the last known-good version, dropping dead code pulled in by mistakeuse-bulk-actions.test.ts/use-bulk-select.test.ts, which tested hooks deliberately removed as dead code long before a stale PR re-added tests for themTokenInfo.address/StreamData.linearAmount+durationfields, a missingafterEachimport, and a nonexistenttoEndWithmatcher in test fixtureswebhook-settingstests to check the inline field errors the component renders now, instead of the toast calls it used before a later, deliberate UX fixuseTokenPrice/usePortfolioValue: an empty stream list returnedtotalUsd=nullinstead of0, and the price cache's error fallback never actually restored the last known-good price into a new component instancevi.resetModules()+ dynamic import, matching the pattern already used elsewhere in this repoact()/fake-timer interactions inuse-auto-withdrawanduse-contracttestsNEXT_PUBLIC_STELLAR_NETWORKin.env.local.exampleandDEPLOYMENT.md, which picks the network but was previously undocumentedTest plan
npm run lint— 0 errorsnpx tsc --noEmit— 0 errorsnpm test— 607/607 passing across 36 filesnpm run build— succeedscloses Document
NEXT_PUBLIC_STELLAR_NETWORKin.env.local.exampleand DEPLOYMENT.md #520