Fix navbar and book duplication #1031
Merged
Conversation
This file contains 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
KoalaSat
commented
Dec 29, 2023
| @@ -10,10 +10,10 @@ | |||
| "Existing orders match yours!": "Существующие ордеры совпадают с вашими!", | |||
There was a problem hiding this comment.
Didn't touch this file but pre-commit insisted on touching it
There was a problem hiding this comment.
Yes, I expected this could happen once we started commiting /locales changes into v0.6.0. The ru.json in Main branch was updated via contribution, it was then merged into the v0.6.0 branch. So the pre-commit script possibly found phrases in v0.6.0 that were not there in the updated ru.json . It is safe to add this ru.json reformatting!
|
Thank you for these fixes @KoalaSat . Please share an invoice for 300K Sats for a small dev donation for your latest contributions :) |
Reckless-Satoshi
merged commit 16a16da
into
RoboSats:the-federation-layer-v0.6.0
3 checks passed
|
190d182dc51c8dd82a7cc3b089f16f477b34b9151b947ad63f2fdee90d21838e |
Reckless-Satoshi
added a commit
that referenced
this pull request
Mar 17, 2024
* Refactor contexts and models (#921) * Add SVG icons for map pins * Add federation basis and new coordinator form (#793) * Add new coordinator entry issue form * Add Federation basis * Fix eslint errors from F2F and fix languages * Redo eslint @typescript-eslint/strict-boolean-expressions * Robot Page working * Contexts Working * Garage Working * CurrentOrder working * Federation model working --------- Co-authored-by: Reckless_Satoshi <reckless.satoshi@protonmail.com> Co-authored-by: Reckless_Satoshi <90936742+Reckless-Satoshi@users.noreply.github.com> * Fix version, release_note and small typo * Fix (some) lint issues * Fix old merge conflict on federation.md * Add cordinator: Temple of Sats * Federation view fixes (#923) * Fix lint issues * More fixes * Fix PRO * Remove template coordinator * Add coordinator: Satstralia * Add Simplex contact method to coordinator dialog * Add new X icons, replace Twitter * Add satstralia PGP keys * Add PGP keys to /static * Fix robot recovery (#945) * Fix Robot recovery * Change testralia onion * Fix order page * Fix last order * Not expose current notification order * Fix * Change getRobot by getSlot (#955) * Fix order workflow (#957) * Order workflow working * Refactoring * Add coordinator notice * Fix and update About * Update Dispute prompts for multi-coordinator * Adapt garage to coordinators * Fix mobile app (#969) * Update temple of sats, new prettier format * Fix statusToDelay, linting and others * Add robo-identity-wasm * Small fixes * Small fixes * Avatar hashid in Garage (#983) * Fix and disable strict boolean lintern * Fix un-silence all mainnet coordinators * Fix add extra JS bundles and .wasm to uploaded artifacts * Fix navbar and book duplication (#1031) * Add coordinator: TheBigLake * Feat hide LocalDev coordinator conditionally * Robohash gereator queue (#1035) Robohash generator queue * Fix coordinator table avatars flip * Fix coordinator avatar on maker form * Fix update coordinators urls on network change * Fix depth chart and coordinator table (#1039) Fix depth chart and Coordinator table * Add coordinator warning * Fix show coordinator warning only once * Remove generating avatar animation * Fix order tab navigation * Fix order flow (#1040) Fix Order flow * Add extra row to coordinator table * Fix order autoupdate and chat (#1047) * Fix Order autoupdate and chat * Remove console.log * fix: Remove .js files from linting (#1049) Co-authored-by: count-null <70529195+count-null@users.noreply.github.com> * Perf hide animated backgrounds * Fix onboarding offers/create navigation * Fix undefined currencyCode * Fix chat avatars and numeric displays * Fix successful prompt avatars, rate text and txid * Small fixes and lint fixes * Fix coordinator avatars orientation * Fix unsafeAlert and grab safe urls from federation.json * Fix click order on order map * Fix cancel button, add debug console log fetchOrder * Add setAcknowledgeWarning to initialAppContext * Add simple web hosted federated client * Update federated frontend url * Fix Contexts * Fix do not share chat logs on disputes by default * fix infinite re-render loop * Re-set fetchOrder on page change, empty book on not_found * Add coordinator endpoint to stats for nerds * Fix navigation * Small fixes * Fix too-many fetchRobots and coordinator endpoints print * Fix currentOrder fetch * Fix duplicated version on stats for nerds * Minor lint fixes * Fix coordinator hosted web app * Fix amount string on order details * Fix unsafe_alert locale string * Add devfund donation to coordinator summary accordion * Fix book table in the v0.6.0 version (#1083) * Get favorites from context * Rerender objects on favorite mode change * Format sats amount in millionths * Revert to v0.6.0 deps and notes * Fix devfund fraction validation * Fix garage deletion (#1085) * Fix compute exchange active robots by max * Fix book loading (#1086) * Fix book loading * Fix Robot page * Code Review * Book coordinator filter (#1087) * Fix book loading * Fix Robot page * Code Review * Book coordinator filter * Fix matches in MakerPage * Fix book filter avatar sizes and bookUpdate on refresh * Fix host filter overflow on small displays * Delete Rebellion * Fix decimal fees and exchange stats * Fix telegram link (#1099) * Fix rewards claim * Fix hide collab cancel request after fiat sent * Add federation coordinator est. date and hard limits * Add programatic order size limit to new coordinators * Add size limits and onchain swap status to coordinator prof * Update templeofsats tg handle * Update dispute prompt contacts * update temple of sats * Add coordinator: BitcoinVeneto * fix change veneto coordinator badges * update bitcoinveneto contact methods * Fix coordinator selector maker page (#1157) * Fix coordinator selector on Maker page * Refactor onUpdate naming * Fix loading robots (#1166) * Fix loading Robot orders * remove logs * feat: move looking for orders loading bar --------- Co-authored-by: KoalaSat <yv1vtrul@duck.com> * Add loading robot profile (#1176) * Add loading robot profile * Typo * Fix undefined prices error (#1173) * Makes filtering by multiple payment methods in desktop possible (#1172) * Make the payments autocomplete header text independant on isFilter prop * makes filtering by MULTIPLE PAYMENT METHODS possible without great impact in the current experience on DESKTOP only --------- Co-authored-by: Reckless_Satoshi <90936742+Reckless-Satoshi@users.noreply.github.com> * Fix order navbar (#1178) * Fix renew order refresh (#1179) * Fix federation summary (#1180) * Fix federation summary * Fix federation summary * Make it dynamic * Make it dynamic * Fix depth chart borked and premium precision * Update coordinator BitcoinVeneto * Add established date to coordinator dialog --------- Co-authored-by: KoalaSat <yv1vtrul@duck.com> Co-authored-by: nullcount <70529195+nullcount@users.noreply.github.com> Co-authored-by: count-null <70529195+count-null@users.noreply.github.com> Co-authored-by: aftermath <131321480+aftermath2@users.noreply.github.com> Co-authored-by: Renato Peres <56004079+Renato1478@users.noreply.github.com>
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.
What does this PR do?
/bookThis PR introduces/refactors/...
Checklist before merging
pip install pre-commit, thenpre-commit install. Pre-commit installs git hooks that automatically check the codebase. If pre-commit fails when you commit your changes, please fix the problems it points out.