Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: swapped accounts with wallet #2876

Closed
wants to merge 1 commit into from
Closed

fix: swapped accounts with wallet #2876

wants to merge 1 commit into from

Conversation

Harshit-Prasad
Copy link

This PR swaps the word account with wallet. Mainly in user-menu, accounts-menu and in connect-a-wallet page.

fixes: #2872

Type of Change

  • fix: Bug fix (non-breaking change which fixes an issue)

Screenshots of the changes

account-menu
user-menu
connect-a-wallet

How has this been tested?

Changes are reflected in the extension without breaking anything.

Copy link

New and updated dependencies detected. Learn more about Socket for GitHub ↗︎

Packages Version New capabilities Transitives Size Publisher
@noble/curves 1.2.0 None +0 1.35 MB paulmillr
prettier 3.1.0 filesystem, environment +0 8.44 MB prettier-bot
webpack-bundle-analyzer 4.10.1 filesystem, environment +11 2.04 MB valscion
@scure/bip32 1.3.2 None +2 1.49 MB paulmillr
@types/lodash.snakecase 4.1.8...4.1.9 None +1/-1 866 kB types
@types/lodash.pick 4.4.8...4.4.9 None +1/-1 866 kB types
@types/lodash.merge 4.6.8...4.6.9 None +1/-1 866 kB types
liquidjs-lib 6.0.2-liquid.29...6.0.2-liquid.31 None +6/-5 998 kB altafan
@types/react-modal 3.16.2...3.16.3 None +4/-4 1.6 MB types
@types/elliptic 6.4.16...6.4.17 None +1/-1 25.6 kB types
lnmessage 0.2.3...0.2.6 None +1/-2 4.76 MB aaronbarnardsound
@types/uuid 9.0.6...9.0.7 None +0/-0 6.65 kB types
@testing-library/react 14.0.0...14.1.2 environment +21/-27 7.98 MB testing-library-bot
@types/crypto-js 4.1.3...4.2.1 None +0/-0 60 kB types
react-router-dom 6.17.0...6.19.0 None +2/-2 3.88 MB mjackson
@commitlint/cli 17.8.0...17.8.1 None +37/-43 409 MB escapedcat
@types/webextension-polyfill 0.10.5...0.10.6 None +0/-0 487 kB types
@types/react-dom 18.2.13...18.2.15 None +4/-4 1.63 MB types
dayjs 1.11.9...1.11.10 None +0/-0 664 kB iamkun
@getalby/sdk 2.5.0...2.6.0 None +1/-0 981 kB reneaaron
tailwindcss 3.3.3...3.3.5 None +30/-29 418 MB adamwathan
@typescript-eslint/eslint-plugin 6.8.0...6.11.0 None +23/-22 9.68 MB jameshenry
@types/pubsub-js 1.8.5...1.8.6 None +0/-0 5.52 kB types
@typescript-eslint/parser 6.8.0...6.11.0 None +18/-17 6.73 MB jameshenry
@headlessui/react 1.7.16...1.7.17 None +0/-0 533 kB thecrypticace
uuid 9.0.0...9.0.1 None +0/-0 123 kB ctavan
bitcoinjs-lib 6.1.3...6.1.5 None +1/-1 333 kB junderw
lint-staged 15.0.2...15.1.0 None +2/-3 782 kB okonet
i18next-browser-languagedetector 7.1.0...7.2.0 None +2/-2 363 kB adrai
@swc/core 1.3.95...1.3.96 None +11/-10 408 MB kdy1
puppeteer 21.4.1...21.5.2 None +11/-13 13.3 MB google-wombot
eslint 8.52.0...8.54.0 None +11/-11 4.92 MB eslintbot
fake-indexeddb 4.0.1...4.0.2 None +1/-1 294 kB dumbmatter
@tailwindcss/forms 0.5.4...0.5.7 None +32/-31 418 MB thecrypticace
@commitlint/config-conventional 17.8.0...17.8.1 None +0/-0 9.61 kB escapedcat
@trivago/prettier-plugin-sort-imports 4.2.1...4.3.0 None +8/-9 13.6 MB behraang
@playwright/test 1.39.0...1.40.0 None +2/-2 10.1 MB dgozman-ms

@volfiros
Copy link
Contributor

@Harshit-Prasad u need to change the translations for other languages too not only for english

@rolznz
Copy link
Contributor

rolznz commented Nov 20, 2023

@Harshit-Prasad u need to change the translations for other languages too not only for english

@Rithvik-padma I don't think this is right - we cannot know what the correct translation is for all languages. There is a script created by @reneaaron in .github/workflows/translations.yml which should check keys from other languages to see if any need to be removed, and a script you can run here to remove them: scripts/remove-outdated-translations.js

@@ -0,0 +1 @@
nodeLinker: node-modules
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this file? Otherwise please remove it...

Copy link
Contributor

@reneaaron reneaaron left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Harshit-Prasad You just need to update the English translation keys and run the script @rolznz mentioned, which will remove the keys from the translated files.

This will remove existing translations and allows translators to add the new translations (since they are very different from what we have now, e.g. "Add account" vs "Add wallet").

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please undo those changes.

@Harshit-Prasad Harshit-Prasad closed this by deleting the head repository Nov 23, 2023
@AdarshRawat1
Copy link
Contributor

@Harshit-Prasad You just need to update the English translation keys and run the script @rolznz mentioned, which will remove the keys from the translated files.

@reneaaron
I tried running the scripts and I can't seem to get things right.
image

p.s.- I even tried modifying the script, trying different arguments nothing seems to work

@reneaaron
Copy link
Contributor

That's strange. I just executed the commands in your branch locally and they seemed to work. 🤔

Maybe you could try to debug the script by adding console.log statements here:
https://github.com/getAlby/lightning-browser-extension/blob/fix/swapped-account-for-wallet/scripts/remove-outdated-translations.js#L13

Otherwise just skip it and I'll have another look before we merge it.

@AdarshRawat1
Copy link
Contributor

That's strange. I just executed the commands in your branch locally and they seemed to work. 🤔

Thank you, @reneaaron , I ran the script using WSL, and it worked.🚀🚀
I was using Windows terminal and CMD.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Swap "accounts" for "wallets" copy
5 participants