fix(build): repair 3 merge-corrupted files (refs #445)#449
Open
winsznx wants to merge 1 commit into
Open
Conversation
) main does not build — several mis-resolved merge conflicts committed both sides of a conflict into the same file. This repairs 3 of the 4 affected files; useSocket.ts is intentionally left out pending a maintainer decision (see StellarFlow-Network#445). - OracleHealthIndicator.tsx: restore the status-dot block (ping-ring className + core-dot opening/className array) deleted by merge 77f2658, keeping that merge's legit `contain: layout paint` change. - useValidatorBatch.ts: collapse the two nested useQuery calls into one, reconciling both branches' intent (normalizedAddresses + in-fn cache check, plus getCacheOptions('SHORT_INTERVAL')-driven staleTime/gcTime); drop the duplicate option keys. - PriceFeedCard.tsx: dedupe the Shimmer import and use individual skeleton paths (the @/components/skeletons barrel was removed); drop the duplicate useState(data); keep the mounted-guarded effect dependency arrays; collapse the duplicated polling effect. After this, `tsc --noEmit` reports only the pre-existing useSocket.ts parse error. useSocket.ts needs the implementation decision documented in StellarFlow-Network#445 (wsManager pool vs direct WebSocket) and is out of scope here.
|
Hey @winsznx! 👋 It looks like this PR isn't linked to any issue. If this PR is for one of the issues assigned to you as part of a Wave, please link it to ensure your contribution is tracked properly. You can do this by adding a keyword to the PR description (e.g.,
|
|
@GBOYEE has applied to work on this issue as part of the Stellar Wave Program's 6th wave.
ℹ️ Repo Maintainers: To accept this application, review their application or assign @GBOYEE to this issue. |
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.
Summary
maindoes not build. SeveralMerge branch 'main' into <feature>commits were resolved by keeping both sides of the conflict, landing parse errors onmain(no CI build gate to catch them). Full diagnosis in #445.This PR repairs 3 of the 4 affected files.
useSocket.tsis intentionally left out — it needs a maintainer decision (see #445 and the note below).Refs #445
Changes
OracleHealthIndicator.tsx— restore the status-dot block (ping-ringclassName+ the core-dot's opening<div>andclassName={[...]}array) that merge77f2658deleted, leaving an orphan]. The same merge's legitimatestyle={{ contain: "layout paint" }}change is preserved.useValidatorBatch.ts— merge736792anested twouseQuerycalls and left duplicate keys (refetchOnWindowFocus,staleTime). Collapsed to one, reconciling both branches:normalizedAddresses+ in-fn cache check andgetCacheOptions('SHORT_INTERVAL')-drivenstaleTime/gcTime.PriceFeedCard.tsx— mergebe3793bkept both sides at several sites:Shimmerimport and switched to the individual skeleton paths (the@/components/skeletonsbarrel was removed in the "eliminate barrel files" commit, so that import didn't resolve);const [data, setData] = useState(...)(kept the cache-seeded initializer);mounted-guarded dependency arrays on the WS-merge and WS-error effects;useEffect.Verification
After this PR, the only remaining error is the pre-existing
useSocket.tsparse error — every other file now type-checks. Each change was recovered from git history / reconciled to the evident intent of the conflicting branches; no behavior was invented.useSocket.ts(needs a maintainer decision)useSocket.tswas corrupted by mergeb9e517f, which interleaved two incompatible implementations — an olderwsManagerconnection-pool version and a newer direct-new WebSocket()rewrite. The result is semantically broken (e.g.disconnectis defined twice, and one body subscribes instead of disconnecting), and there's no clean version to recover from. Repairing it safely means choosing one implementation and rebuilding the hook — a call for the maintainers, since it's the live data-feed core. Details in #445.So this PR gets the tree down to a single remaining broken file; once the
useSocket.tsdirection is decided, the build goes green. Happy to follow up onuseSocket.tsonce you confirm which implementation to keep.