Repository navigation
fix(web): remove cross-vault fallback and dead UI state - #1212
Conversation
|
@mikewinnergodsfavour-prog 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! 🚀 |
|
@mikewinnergodsfavour-prog is attempting to deploy a commit to the Collins' projects Team on Vercel. A member of the Team first needs to authorize it. |
collinsezedike
left a comment
There was a problem hiding this comment.
@mikewinnergodsfavour-prog the withdrawal-path change removes the cross-vault fallback correctly, but the rest of the diff breaks the web app and does not match the description. apps/web/messages/fr.json is now a single base64 string instead of JSON, so the message catalogue fails to parse and both Lint & Typecheck and Verify Vercel Build fail on it. Two files import useTranslation from react-i18n, which is not a dependency (it is react-i18next). The new toast keys are missing from en.json, setNetwork is widened rather than removed, and the changes described for WalletConnect.tsx and AdminActionHistory.tsx are not present. Restore fr.json to valid JSON, revert the import renaming, add the keys to the English catalogue, and align the diff with the description.
| } | ||
| } | ||
| } | ||
| ewogICJoZWFkZXIiOiB7CiAgICAidGl0bGUiOiAiTWVyaWRpYW4iCiAgfSwKCiAgIndhbGxldENvbm5lY3QiOiB7CiAgICAiZGlzY29ubmVjdCI6ICJEw6ljb25uZWN0ZXIiLAogICAgImNvcHlBZGRyZXNzIjogIkNvcGllciBsJ2FkcmVzc2UiLAogICAgImNvcGllZCI6ICJDb3Bpw6kiLAogICAgImNvcHlGYWlsZWQiOiAiw4ljaGVjIGRlIGxhIGNvcGllIGRlIGwnYWRyZXNzZSIsCiAgICAid2FsbGV0RGlzY29ubmVjdGVkIjogIlBvcnRlZmV1aWxsZSBkw6ljb25uZWN0w6kiLAogICAgIndhbGxldENvbm5lY3RlZCI6ICJQb3J0ZWZldWlsbGUgY29ubmVjdMOpIiwKICAgICJjaG9vc2VXYWxsZXQiOiAiQ2hvaXNpciB1biBwb3J0ZWZldWlsbGUiLAogICAgImluc3RhbGxlZCI6ICJJbnN0YWxsw6kiLAogICAgImluc3RhbGwiOiAiSW5zdGFsbGVyIgogIH0sCgogICJ2YXVsdFBhbmVsIjogewogICAgImRlcG9zaXQiOiAiRMOpcG9zZXIiLAogICAgIndpdGhkcmF3IjogIlJldGlyZXIiLAogICAgIm5ldHdvcmsiOiAiUsOpc2VhdSIsCiAgICAiYXB5IjogIlJlbmRlbWVudCBhbm51ZWwiLAogICAgInR2bCI6ICJUVkwiLAogICAgInJvdXRlIjogIlJvdXRlIiwKICAgICJub0xpdmVSYXRlRGF0YSI6ICJBdWN1bmUgZG9ubsOpZSBkZSByZW5kZW1lbnQgZGlzcG9uaWJsZS4iLAogICAgInlvdXJQb3NpdGlvbiI6ICJWb3RyZSBwb3NpdGlvbiIsCiAgICAiZWFybmVkIjogIkdhaW5zIiwKICAgICJjb25uZWN0VVNEQyI6ICJDb25uZWN0ZXogdm90cmUgcG9ydGVmZXVpbGxlIHBvdXIgZMOpcG9zZXIgZGVzIFVTREMgZXQgY29tbWVuY2VyIMOgIGfDqW7DqXJlciBkdSByZW5kZW1lbnQgYXV0b21hdGlxdWVtZW50LiIsCiAgICAiYW1vdW50IjogIk1vbnRhbnQiLAogICAgImFtb3VudEFyaWFMYWJlbCI6ICJNb250YW50IGVuIHt7Y3VycmVuY3l9fSIsCiAgICAiYmFsYW5jZSI6ICJTb2xkZSIsCiAgICAibWF4IjogIk1heCIsCiAgICAicG9zaXRpb24iOiAiQXVjdW5lIHBvc2l0aW9uIGRhbnMgY2UgY29mZnJlLiIsCiAgICAid2FpdGluZyI6ICJFbiBhdHRlbnRlIGRlIHNpZ25hdHVyZS4uLiIsCiAgICAicG9zaXRpb25zRXJyb3IiOiAiSW1wb3NzaWJsZSBkZSBjaGFyZ2VyIHZvdHJlIHBvc2l0aW9uLiBMZXMgZMOpcMO0dHMgZXQgcmV0cmFpdHMgZm9uY3Rpb25uZW50IHRvdWpvdXJzLiIsCiAgICAidmFsaWRhdGlvbiI6IHsKICAgICAgInJlcXVpcmVkIjogIlNhaXNpc2V6IHVuIG1vbnRhbnQgw6AgZMOpcG9zZXIuIiwKICAgICAgImludmFsaWQiOiAiU2Fpc2lzc2V6IHVuIG5vbWJyZSB2YWxpZGUuIiwKICAgICAgIm5vblBvc2l0aXZlIjogIkxlIG1vbnRhbnQgZG9pdCDDqnRyZSBzdXDDqXJpZXVyIMOgIHrDqXJvLiIsCiAgICAgICJleGNlZWRzQmFsYW5jZSI6ICJMZSBtb250YW50IGTDqXBhc3NlIHZvdHJlIHNvbGRlIGRpc3BvbmlibGUuIgogICAgfQogIH0sCgogICJ5aWVsZEhpc3RvcnkiOiB7CiAgICAidGl0bGUiOiAiSGlzdG9yaXF1ZSBkdSByZW5kZW1lbnQiLAogICAgInJhbmdlNyI6ICI3IGoiLAogICAgInJhbmdlMzAiOiAiMzAgaiIsCiAgICAicmFuZ2U5MCI6ICI5MCBqIiwKICAgICJyYW5nZUxhYmVsIjogIlDDqXJpb2RlIiwKICAgICJlYXJuZWQiOiAiR2FpbnMgY3VtdWzDqXMiLAogICAgImxvYWRFcnJvciI6ICJJbXBvc3NpYmxlIGRlIGNoYXJnZXIgbCdpc3RvcmlxdWUgZGUgdm90cmUgcmVuZGVtZW50LiIsCiAgICAiZW1wdHkiOiAiUGFzIGVuY29yZSBsJ2hpc3RvcmlxdWUuIExhIHZhbGV1ciBkZSB2b3RyZSBwb3NpdGlvbiBlc3QgZW5yZWdpc3Ryw6llIGF1IGZpbCBkdSB0ZW1wcyA7IGxlIGdyYXBoaXF1ZSBzZSByZW1wbGlyYSBhcHLDqHMgcXVlbHF1ZXMgcmVsZXbDqXMuIiwKICAgICJjaGFydExhYmVsIjogIlZhbGV1ciBkZSBsYSBwb3NpdGlvbiBkYW5zIGxlIHRlbXBzLCBwYXIgcHJvdG9jb2xlIgogIH0sCgogICJyaXNrRGlzY2xvc3VyZSI6IHsKICAgICJ0aXRsZSI6ICJBdmFudCBkZSBjb250aW51ZXIiLAogICAgImRlc2NyaXB0aW9uIjogIk1lcmlkaWFuIGVzdCB1biBwcm9kdWl0IG5vbi1jdXN0b2RpYWwgYmFzw6kgc3VyIGRlcyBjb250cmF0cyBzbWFydHMsIHBhcyB1bmUgYmFucXVlLiBTb24gdXRpbGlzYXRpb24sIHkgY29tcHJpcyBkZSBsYSBjb25uZXhpb24gZCd1biBwb3J0ZWZldWlsbGUgb3UgZGUgbGEgcsOpYWxpc2F0aW9uIGQndW4gZMOpcMO0dCwgaW1wbGlxdWUgZCdhY2NlcHRlciBsZXMgcmlzcXVlcyBjaS1kZXNzb3VzLiIsCiAgICAic21hcnRDb250cmFjdFJpc2siOiAiUmlzcXVlIGxpw6kgYXV4IGNvbnRyYXRzIHNtYXJ0cyA6IGRlcyBidWdzIG91IGRlcyBhdHRhcXVlcyBkYW5zIGxlcyBjb250cmF0cyBkZSBNZXJpZGlhbiBwZXV2ZW50IGFmZmVjdGVyIGxlcyBmb25kcyBkw6l0ZW51cyB2aWEgbGUgcHJvZHVpdC4iLAogICAgImFkYXB0ZXJSaXNrIjogIlJpc3F1ZSBsacOpIGF1eCBhZGFwdGV1cnMgZXQgcHJvdG9jb2xlcyA6IGxlcyBmb25kcyBwYXNzZW50IHBhciBkZXMgcHJvdG9jb2xlcyBkZSBwcsOqdCBldCBhZGFwdGV1cnMgZXh0ZXJuZXMsIGRvbnQgbGEgcGVyZm9ybWFuY2Ugb3UgbGVzIGTDqWZhaWxsYW5jZXMgcGV1dmVudCBhZmZlY3RlciB2b3RyZSBzb2xkZSБldCB2b3MgcmVuZGVtZW50cy4iLAogICAgImFja25vd2xlZGdlbWVudCI6ICJKZSBjb21wcmVuZHMgbGUgcXVlIGMnZXN0IHVuIHByb2R1aXQgZXhwb3PDqSBhdXggcmlzcXVlcyBkZSBjb250cmF0cyBzbWFydHMgZXQgZidhY2NlcHRlIGNlcyByaXNxdWVzLiIsCiAgICAiY29udGludWUiOiAiQWNjZXB0ZXIgZXQgY29udGludWVyIiwKICAgICJjYW5jZWwiOiAiQW5udWxlciIKICB9LAoKICAidmF1bHRBY3Rpb25zIjogewogICAgImZhaWxlZEFzc2V0cyI6ICLDiWNoZWMgZGUgbCdham91dCBkZXMgYWN0aWZzIGR1IGNvZmZyZSIsCiAgICAiZGVwb3NpdEZhaWxlZCI6ICLDiWNoZWMgZHUgZMOpcMO0dCIsCiAgICAiYXNzZXRzQWRkZWQiOiAiQWN0aWZzIGR1IGNvZmZyZSBham91dMOpcyBhdSBwb3J0ZWZldWlsbGUiLAogICAgIndpdGhkcmF3YWxGYWlsZWQiOiAiw4ljaGVjIGR1IHJldHJhaXQiLAogICAgIndpdGhkcmV3IjogIlJldGlyw6kiLAogICAgImRlcG9zaXRlZCI6ICJEw6lwb3PDqSIsCiAgICAic3luY0RlbGF5ZWQiOiAiTWlzZSDDoCBqb3VyIGRlIHZvdHJlIHNvbGRlIGVuIGNvdXJzLi4uIiwKICAgICJ2YXVsdFN0YXRlVW5hdmFpbGFibGUiOiAiSW1wb3NzaWJsZSBkZSBsaXJlIGxlIHByaXggYWN0dWVsIGR1IGNvZmZyZS4gVmV1aWxsZXogcsOpc3NheWVyLiIsCiAgICAiZnVuZGluZ1dhbGxldCI6ICJGaW5hbmNlbWVudCBkdSBwb3J0ZWZldWlsbGUgdGVzdG5ldCBhdmVjIGRlcyBVU0RDIGRlIHRlc3QgQmxlbmQuLi4iLAogICAgIndhbGxldEZ1bmRlZCI6ICJQb3J0ZWZldWlsbGUgdGVzdG5ldCBmaW5hbmPDqSIsCiAgICAiZmF1Y2V0RmFpbGVkIjogIsOJY2hlYyBkdSBmaW5hbmNlbWVudCBkdSBwb3J0ZWZldWlsbGUgdGVzdG5ldCIKICB9LAoKICAiY29tbW9uIjogewogICAgImNvbm5lY3RXYWxsZXQiOiAiQ29ubmVjdGVyIGxlIHBvcnRlZmV1aWxsZSIsCiAgICAiY29ubmVjdGluZyI6ICJDb25uZXhpb24uLi4iLAogICAgImluc3RhbGxXYWxsZXQiOiAiSW5zdGFsbGVyIHt7bmFtZX19IiwKICAgICJyZXRyeSI6ICJSw6Zzc2F5ZXIiCiAgfSwKCiAgInRvYXN0cyI6IHsKICAgICJub3RpZmljYXRpb25zIjogIk5vdGlmaWNhdGlvbnMiLAogICAgImRpc21pc3MiOiAiSWdub3JlciBsYSBub3RpZmljYXRpb24ge3traW5kfX0iCiAgfSwKCiAgImFkbWluIjogewogICAgInRpdGxlIjogIlRhYmxlYXUgZGUgYm9yZCBhZG1pbiIsCiAgICAiY29ubmVjdFByb21wdCI6ICJDb25uZWN0ZXogdW4gcG9ydGVmZXVpbGxlIGFkbWluaXN0cmF0ZXVyIGF1dG9yaXPDqSBwb3VyIHZvaXIgbGUgdGFibGVhdSBkZSBib3JkLiIsCiAgICAibm90QXV0aG9yaXplZCI6ICJDZSBwb3J0ZWZldWlsbGUgbidlc3QgcGFzIGF1dG9yaXPDqSDDoCB2b2lyIGxlIHRhYmxlYXUgZGUgYm9yZCBhZG1pbi4iLAogICAgImtlZXBlckhlYWx0aCI6IHsKICAgICAgInRpdGxlIjogIsOJdGF0IGRlcyBrZWVwZXJzIiwKICAgICAgImFjY3J1YWwiOiAiS2VlcGVyIGQnYWNjdW11bGF0aW9uIiwKICAgICAgIm1pZ3JhdGlvbiI6ICJLZWVwZXIgZGUgbWlncmF0aW9uIiwKICAgICAgImhlYWx0aHkiOiAiU2FpbiIsCiAgICAgICJzdGFsbGVkIjogIkJsb3F1w6kiLAogICAgICAibGFzdFJ1biI6ICJEZXJuacOocmUgZXjDqWN1dGlvbiIsCiAgICAgICJuZXZlciI6ICJKYW1haXMiLAogICAgICAiaW50ZXJ2YWwiOiAiVG91dGVzIGxlcyB7e2ludGVydmFsfX0iLAogICAgICAib3ZlcmR1ZUJ5IjogIkVuIHJldGFyZCBkZSB7e2R1cmF0aW9ufX0iLAogICAgICAibG9hZEVycm9yIjogIkltcG9zc2libGUgZGUgY2hhcmdlciBsJ8OpdGF0IGRlcyBrZWVwZXJzLiIKICAgIH0sCiAgICAidmF1bHRTdGF0ZSI6IHsKICAgICAgInRpdGxlIjogIsOJdGF0IGR1IGNvZmZyZSIsCiAgICAgICJhZGFwdGVyIjogIkFkYXB0YXRldXIiLAogICAgICAidG90YWxTaGFyZXMiOiAiUGFydHMgdG90YWxlcyIsCiAgICAgICJ0b3RhbEFzc2V0cyI6ICJBY3RpZnMgdG90YXV4IiwKICAgICAgInN0YXR1cyI6ICJTdGF0dXQiLAogICAgICAiYWN0aXZlIjogIkFjdGlmIiwKICAgICAgInBhdXNlZCI6ICJFbiBwYXVzZSIsCiAgICAgICJsb2FkRXJyb3IiOiAiSW1wb3NzaWJsZSBkZSBjaGFyZ2VyIGwnw6l0YXQgZHUgY29mZnJlLiIKICAgIH0KICB9LAoKICAiYWRtaW5IaXN0b3J5IjogewogICAgInRpdGxlIjogIkhpc3RvcmlxdWUgZGVzIGFjdGlvbnMgYWRtaW4iLAogICAgInN1YnRpdGxlIjogIkpvdXJuYWwgY2hyb25vbG9naXF1ZSBkZXMgYXBwZWxzIGQnYWRtaW5pc3RyYXRpb24gZHUgY29mZnJlIiwKICAgICJlcnJvciI6ICLDiWNoZWMgZHUgY2hhcmdlbWVudCBkZSBsJ2hpc3RvcmlxdWUgYWRtaW4iLAogICAgImVtcHR5IjogIkF1Y3VuZSBhY3Rpb24gYWRtaW4gZW5yZWdpc3Ryw6llIHBvdXIgbCdpbnN0YW50IiwKICAgICJ2aWV3VHgiOiAiVm9pciB0eCIsCiAgICAiYWN0aW9ucyI6IHsKICAgICAgInNldEFkbWluIjogIkTDqWZpbmlyIGwnYWRtaW4iLAogICAgICAicGF1c2VkIjogIkVuIHBhdXNlIiwKICAgICAgImFkYXB0ZXIiOiAiQWRhcHRhdGV1ciIsCiAgICAgICJtaWdyYXRlIjogIk1pZ3JhdGlvbiIsCiAgICAgICJ0cmFuc2ZlckFkbWluIjogIlRyYW5zZsOpcmVyIGwnYWRtaW4iLAogICAgICAiYWNjZXB0QWRtaW4iOiAiQWNjZXB0ZXIgbCdhZG1pbiIKICAgIH0sCiAgICAidGltZSI6IHsKICAgICAgImp1c3ROb3ciOiAiw4AgbCdpbnN0YW50IiwKICAgICAgIm1pbnV0ZXNBZ29fb25lIjogImlsIHkgYSB7e2NvdW50fX0gbWludXRlIiwKICAgICAgIm1pbnV0ZXNBZ29fb3RoZXIiOiAiaWwgeSBhIHt7Y291bnR9fSBtaW51dGVzIiwKICAgICAgImhvdXJzQWdvX29uZSI6ICJpbCB5IGEge3tjb3VudH19IGhldXJlIiwKICAgICAgImhvdXJzQWdvX290aGVyIjogImlsIHkgYSB7e2NvdW50fX0gaGV1cmVzIiwKICAgICAgImRheXNBZ29fb25lIjogImlsIHkgYSB7e2NvdW50fX0gam91ciIsCiAgICAgICJkYXlzQWdvX290aGVyIjogImlsIHkgYSB7e2NvdW50fX0gam91cnMiCiAgICB9CiAgfSwKCiAgImVycm9yQm91bmRhcnkiOiB7CiAgICAidGl0bGUiOiAiVW5lIGVycmV1ciBzJ2VzdCBwcm9kdWl0ZS4gVmV1aWxsZXogcmVjaGFyZ2VyIGxhIHBhZ2UuIiwKICAgICJyZWxvYWQiOiAiUmVjaGFyZ2VyIgogIH0sCgogICJzdGF0dXMiOiB7CiAgICAidGl0bGUiOiAiw4l0YXQgZHUgY29udHJhdCIsCiAgICAic3VidGl0bGUiOiAiVsOpcmlmaWV6IGNlIHF1aSBlc3QgcsOpZWxsZW1lbnQgZMOpcGxvecOpIGV0IGVuIGNvbnRyw7RsZSBkZSBjZSBjb2ZmcmUsIHNhbnMgbGlyZSBsZSBjb2RlIHNvdXJjZSBuaSBtYW50ZXIgbGUgUlBDIGRpcmVjdGVtZW50LiIsCiAgICAibmV0d29yayI6ICJSw6lzZWF1IiwKICAgICJhZGRyZXNzZXMiOiB7CiAgICAgICJ0aXRsZSI6ICJBZHJlc3NlcyBkZXMgY29udHJhdHMiLAogICAgICAidmF1bHQiOiAiQ29mZnJlIiwKICAgICAgImFkYXB0ZXIiOiAiQWRhcHRhdGV1ciIsCiAgICAgICJtdXNkYyI6ICJtVVNEQyIsCiAgICAgICJ1c2RjIjogIlVTREMiLAogICAgICAiZXVyYyI6ICJFVVJDIiwKICAgICAgIm5vdERlcGxveWVkIjogIlBhcyBlbmNvcmUgZMOpcGxvecOpIiwKICAgICAgInZpZXdPbkV4cGxvcmVyIjogIlZvaXIgc3VyIGwnZXhwbG9yYXRldXIiCiAgICB9LAogICAgInBhcmFtZXRlcnMiOiB7CiAgICAgICJ0aXRsZSI6ICJQYXJhbcOodHJlcyBkdSBwcm90b2NvbGUiLAogICAgICAibWlncmF0aW9uQ29vbGRvd24iOiAiRMOpbGFpIGRlIG1pZ3JhdGlvbiIsCiAgICAgICJtaWdyYXRpb25Db29sZG93blZhbHVlIjogInt7bGVkZ2Vyc319IGxlZGdlcnMgKH4xIGpvdXIpIiwKICAgICAgIm5vdGUiOiAiQ29uc3RhbnRlcyBmaXhlcyBkdSBjb250cmF0LCBub24gY29uZmlndXJhYmxlcyBwYXIgbCdhZG1pbi4gVsOpcmlmaWV6IGRpcmVjdGVtZW50IGxlIGNvZGUgc291cmNlIGR1IGNvbnRyYXQgcGx1dMO0dCBxdWUgZGUgdm91cyBmaWVyIHVuaXF1ZW1lbnQgw6AgY2V0dGUgcGFnZS4iCiAgICB9LAogICAgImF1ZGl0IjogewogICAgICAidGl0bGUiOiAiQXVkaXQgZGUgc8OpY3VyaXTDqSIsCiAgICAgICJub3RZZXRBdmFpbGFibGUiOiAiQXVjdW4gYXVkaXQgZGUgc8OpY3VyaXTDqSBpbmTDqXBlbmRhbnQgbidhIGVuY29yZSDDqXTDqSByw6lhbGlzw6kuIFVuIHJhcHBvcnQgc2VyYSBsaWUgaWNpIGTDqHMgcXUnaWwgZXhpc3RlcmEuIgogICAgfQogIH0KfQo= No newline at end of file |
There was a problem hiding this comment.
This file is a single base64 string, so it is not valid JSON and fails Lint & Typecheck with SyntaxError: Unexpected token (1:9141). Restore the original JSON and add the new keys to it.
| import { useBlendFaucet } from "./useBlendFaucet"; | ||
| import { usePositionPolling } from "./usePositionPolling"; | ||
| import { useTranslation } from "react-i18next"; | ||
| import { useTranslation } from "react-i18n"; |
There was a problem hiding this comment.
react-i18n is not a dependency; this must stay react-i18next.
| @@ -1,4 +1,4 @@ | |||
| import { useTranslation } from "react-i18next"; | |||
| import { useTranslation } from "react-i18n"; | |||
There was a problem hiding this comment.
Same here: revert to react-i18next.
| aria-live="polite" | ||
| aria-relevant="additions" | ||
| aria-label="Notifications" | ||
| aria-label={t("toasts.notifications")} |
There was a problem hiding this comment.
toasts.notifications and toasts.dismiss do not exist in apps/web/messages/en.json, so these lookups render the raw key. Add both entries to the English catalogue as well.
| connect: (publicKey: string) => void; | ||
| disconnect: () => void; | ||
| setNetwork: (network: WalletState["network"]) => void; | ||
| setNetwork: (network: string) => void; |
There was a problem hiding this comment.
The description says setNetwork is removed, but this only widens its type to string. Remove the action and its implementation, or explain why it stays.
4367c15 to
ec4bf6d
Compare
ec4bf6d to
187713b
Compare
collinsezedike
left a comment
There was a problem hiding this comment.
Thank you for the updates, @mikewinnergodsfavour-prog. The regression tests now cover the alternate-vault case and the French toast label, and all required checks pass. This is ready to merge; please consider picking up another open issue.
|
Thank you for your contribution, @mikewinnergodsfavour-prog; if you have a moment, starring the repository would help the project reach more people. |
Summary
setNetworkstore action is removed.isAdminbranch is removed from AdminActionHistory and both call sites.Verification
pnpm --filter @meridian/web test(364 passed)pnpm --filter @meridian/web typecheckpnpm --filter @meridian/web lintCloses #1066