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

TW-1543 'General' section update #1200

Merged
merged 29 commits into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
130b27a
TW-1555 Update some design and fix some bugs
keshan3262 Sep 13, 2024
b2dad24
TW-1555 Make some modals close after their backdrop is clicked
keshan3262 Sep 13, 2024
1414857
TW-1542 Resolve merge conflicts
keshan3262 Sep 13, 2024
6b250f3
TW-1542 Revert harmful changes
keshan3262 Sep 13, 2024
6dbdca1
TW-1542 Remove unused components
keshan3262 Sep 13, 2024
982e447
TW-1542 Implement new Settings menu design
keshan3262 Sep 13, 2024
4fb9a56
TW-1542 Remove some unused translations
keshan3262 Sep 13, 2024
6fcb3d7
TW-1542 Fix find-deadcode errors
keshan3262 Sep 13, 2024
f18b05d
TW-1542 Add changes from comments
keshan3262 Sep 16, 2024
f97bee1
TW-1543 Redesign 'General' settings section
keshan3262 Sep 16, 2024
3bbbc88
TW-1543 Refactoring
keshan3262 Sep 17, 2024
25b2037
TW-1542 Move localStorage clearing to frontend
keshan3262 Sep 17, 2024
03342d6
TW-1542 Update a label
keshan3262 Sep 17, 2024
9cdeb5c
TW-1555 Some more bugfixes
keshan3262 Sep 17, 2024
de837fa
Merge branch 'TW-1555-final-epic-testing' of https://github.com/madfi…
keshan3262 Sep 17, 2024
cf85bbd
Merge branch 'TW-1542-apply-design-for-settings-page' of https://gith…
keshan3262 Sep 17, 2024
74041ca
TW-1543 Change error output
keshan3262 Sep 17, 2024
93bd61d
TW-1543 Apply design updates
keshan3262 Sep 17, 2024
06f82f7
TW-1555 Remove some commented out code
keshan3262 Sep 17, 2024
ba0dc8a
TW-1543 Remove excessive locales loading checks
keshan3262 Sep 17, 2024
4dee114
TW-1555 Refactor setting classes
keshan3262 Sep 18, 2024
1feeace
TW-1555 Fix prettier problem
keshan3262 Sep 18, 2024
b3df9cc
TW-1555 Agree styles for app content wrapper and action modals
keshan3262 Sep 18, 2024
375d0c9
TW-1543 Bugfixes according to the comment from Figma
keshan3262 Sep 18, 2024
c885837
Merge branch 'TW-1555-final-epic-testing' of https://github.com/madfi…
keshan3262 Sep 18, 2024
f448902
TW-1542 Change a label
keshan3262 Sep 18, 2024
6aa1703
TW-1542 Fix font size for page header
keshan3262 Sep 18, 2024
9fcfbb8
Merge branch 'TW-1542-apply-design-for-settings-page' of https://gith…
keshan3262 Sep 18, 2024
438ab67
TW-1543 Remove an unused import
keshan3262 Sep 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions e2e/src/page-objects/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import { InternalConfirmationPage } from './pages/internal-confirmation.page';
import { ManualBackupModalPage } from './pages/modal/manual-backup-modal.page';
import { NewsletterModalPage } from './pages/modal/newsletter-modal.page';
import { OnRumModalPage } from './pages/modal/on-rum-modal.page';
import { RevealSecretsPage } from './pages/reveal-secrets.page';
import { SendPage } from './pages/send.page';
import { SettingsPage } from './pages/settings.page';
import { setWalletPage } from './pages/setWalletPassword.page';
Expand All @@ -30,7 +29,6 @@ export const Pages = {
ImportExistingWallet: new ImportExistingWalletPage(),
SetWallet: new setWalletPage(),
Settings: new SettingsPage(),
RevealSecrets: new RevealSecretsPage(),
UnlockScreen: new UnlockScreenPage(),
DelegateTab: new DelegateTab(),
DelegateForm: new DelegateFormPage(),
Expand Down
2 changes: 0 additions & 2 deletions e2e/src/page-objects/pages/modal/manual-backup-modal.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { createPageElement, findElements } from '../../../utils/search.utils';

export class ManualBackupModalPage extends Page {
confirmButton = createPageElement(ManualBackupModalSelectors.confirmButton);
cancelButton = createPageElement(ManualBackupModalSelectors.cancelButton);
notedDownButton = createPageElement(ManualBackupModalSelectors.notedDownButton);
protectedMask = createPageElement(ManualBackupModalSelectors.protectedMask);
wordIndex = createPageElement(ManualBackupModalSelectors.wordIndex);
Expand All @@ -20,7 +19,6 @@ export class ManualBackupModalPage extends Page {

if (modalPage == 'Verify') {
await this.confirmButton.waitForDisplayed();
await this.cancelButton.waitForDisplayed();
await this.wordIndex.findElements(3);
await this.seedWordButton.findElements(3);
}
Expand Down
16 changes: 0 additions & 16 deletions e2e/src/page-objects/pages/reveal-secrets.page.ts

This file was deleted.

31 changes: 1 addition & 30 deletions public/_locales/de/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@
}
}
},
"authorizedDApps": {
"message": "Autorisierte DApps",
"description": "DApps = Decentralized Applications"
},
"clickIconToResetPermissions": {
"message": "Klicken Sie auf das X-Symbol, um die Berechtigungen zurückzusetzen."
},
Expand Down Expand Up @@ -647,38 +643,19 @@
"revealPrivateKey": {
"message": "Privaten Schlüssel freigeben"
},
"revealPrivateKeyDescription": {
"message": "Auch bekannt als „Exportkonto“, zeigt den privaten Schlüssel für Ihr ausgewähltes Konto an."
},
"revealSeedPhrase": {
"message": "Seed-Phrase freigeben"
},
"revealSeedPhraseDescription": {
"message": "Auch als \"Export-Wallet\" bekannt, Sie benötigen diese Seed-Phrase möglicherweise, um auf Ihre Wallet und Konten auf anderen Geräten zuzugreifen."
},
"dApps": {
"message": "DApps",
"description": "DApps = Decentralized Applications"
},
"dAppsDescription": {
"message": "In diesem Abschnitt können Sie die Möglichkeit zur Interaktion mit dezentralen Anwendungen aktivieren, die Temple Wallet unterstützen."
},
"networksDescription": {
"message": "In diesem Abschnitt können Sie benutzerdefinierte Tezos-Netzwerke hinzufügen oder löschen.",
"description": "Tezos = blockchain name (https://tezos.com/)"
},
"removeAccount": {
"message": "Konto entfernen"
},
"removeAccountDescription": {
"message": "Verwenden Sie diesen Abschnitt, um Ihr ausgewähltes Konto zu entfernen. Nur importierte Konten können entfernt werden."
},
"about": {
"message": "Über"
},
"aboutDescription": {
"message": "Verwenden Sie diesen Abschnitt, um Metainformationen zu Temple Wallet anzuzeigen."
},
"unlockWallet": {
"message": "Die Wallet entsperren"
},
Expand Down Expand Up @@ -1268,15 +1245,12 @@
"upload": {
"message": "Hochladen"
},
"languageAndCountry": {
"language": {
"message": "Sprache"
},
"generalSettings": {
"message": "Allgemein"
},
"generalSettingsDescription": {
"message": "Hier können Sie die Spracheinstellungen und den Anzeigemodus verwalten."
},
"swapNoun": {
"message": "Wechseln"
},
Expand Down Expand Up @@ -1895,9 +1869,6 @@
"addressBook": {
"message": "Adressbuch"
},
"addressBookDescription": {
"message": "Fügen Sie Ihre Kontakte hinzu, entfernen und verwalten Sie sie."
},
"addNewContact": {
"message": "Neuer Kontakt"
},
Expand Down
171 changes: 130 additions & 41 deletions public/_locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,9 @@
}
}
},
"authorizedDApps": {
"message": "Authorized DApps",
"description": "DApps = Decentralized Applications"
},
"advancedFeatures": {
"message": "Advanced Features"
},
"advancedFeaturesDescription": {
"message": "In this section you can customize additional Temple extension features"
"connectedDApps": {
"message": "Connected Dapps",
"description": "Dapps = Decentralized Applications"
},
"clickIconToResetPermissions": {
"message": "Click on the X icon to reset permissions."
Expand Down Expand Up @@ -703,6 +697,18 @@
"resetExtension": {
"message": "Reset Extension"
},
"resetExtensionModalTitle": {
"message": "Reset Extension?"
},
"resetExtensionModalDescription": {
"message": "Resetting will delete wallets, accounts and erase all data. Ensure your seed phrases and Private Keys are backed up to avoid permanent loss and recover access to assets later."
},
"resetPasswordInputLabel": {
"message": "Enter the password to confirm reset"
},
"reset": {
"message": "Reset"
},
"resetExtensionConfirmation": {
"message": "Are you sure you want to reset the Temple Wallet?\nAs a result, all your data will be deleted."
},
Expand Down Expand Up @@ -948,29 +954,16 @@
"revealPrivateKey": {
"message": "Reveal Private Key"
},
"revealPrivateKeyDescription": {
"message": "Also known as \"Export Account\", reveals private key for your selected account."
},
"revealPrivateKeyPasswordLabel": {
"message": "Enter your password to reveal private key"
},
"revealSeedPhrase": {
"message": "Reveal Seed Phrase"
},
"revealSeedPhraseDescription": {
"message": "Also known as \"Export Wallet\", you may need this seed phrase to access your wallet and accounts on other devices."
},
"dApps": {
"message": "DApps",
"description": "DApps = Decentralized Applications"
},
"dAppsDescription": {
"message": "In this section you can enable ability to interact with decentralized applications that support Temple Wallet."
},
"networksDescription": {
"message": "In this section you can add or delete custom Tezos networks.",
"description": "Tezos = blockchain name (https://tezos.com/)"
},
"removeAccount": {
"message": "Remove Account"
},
Expand All @@ -980,8 +973,8 @@
"accountsManagement": {
"message": "Accounts management"
},
"accountsManagementDescription": {
"message": "Use this section to create, edit, and delete accounts."
"securityAndPrivacy": {
"message": "Security & Privacy"
},
"editAccount": {
"message": "Edit Account"
Expand Down Expand Up @@ -1026,15 +1019,15 @@
"selectNetworkToReveal": {
"message": "Select Network to reveal"
},
"about": {
"message": "About"
"additionalFeatures": {
"message": "Additional Features"
},
"aboutAndSupport": {
"message": "About & Support"
},
"info": {
"message": "Info"
},
"aboutDescription": {
"message": "Use this section to view meta info about Temple Wallet."
},
"unlockWallet": {
"message": "Unlock the Wallet"
},
Expand Down Expand Up @@ -1664,6 +1657,9 @@
"amountPlaceholder": {
"message": "e.g. 123.45"
},
"myAccounts": {
"message": "My Accounts"
},
"sendToMyAccounts": {
"message": "Send to My Accounts"
},
Expand Down Expand Up @@ -1803,7 +1799,7 @@
"upload": {
"message": "Upload"
},
"languageAndCountry": {
"language": {
"message": "Language"
},
"fiatCurrency": {
Expand All @@ -1812,9 +1808,6 @@
"generalSettings": {
"message": "General"
},
"generalSettingsDescription": {
"message": "Here you can manage languages preferences and display mode."
},
"swapNoun": {
"message": "Swap"
},
Expand Down Expand Up @@ -2585,9 +2578,6 @@
"addressBook": {
"message": "Address Book"
},
"addressBookDescription": {
"message": "Add, remove and manage your contacts."
},
"addNewContact": {
"message": "New contact"
},
Expand Down Expand Up @@ -3203,11 +3193,8 @@
"sync": {
"message": "Sync"
},
"synchronization": {
"message": "Synchronization"
},
"synchronizationSettingsDescription": {
"message": "Sync with Mobile Temple Wallet."
"templeSync": {
"message": "Temple Sync"
},
"syncSettingsTitle": {
"message": "Sync with Mobile Temple Wallet"
Expand Down Expand Up @@ -3477,5 +3464,107 @@
},
"allNetworks": {
"message": "All Networks"
},
"enLangName": {
"message": "English"
},
"en_GBLangName": {
"message": "English ‒ United Kingdom"
},
"frLangName": {
"message": "French"
},
"deLangName": {
"message": "German"
},
"zh_CNLangName": {
"message": "Chinese ‒ Simplified"
},
"zh_TWLangName": {
"message": "Chinese ‒ Traditional"
},
"jaLangName": {
"message": "Japanese"
},
"koLangName": {
"message": "Korean"
},
"ukLangName": {
"message": "Ukrainian"
},
"trLangName": {
"message": "Turkish"
},
"ptLangName": {
"message": "Portuguese"
},
"usdName": {
"message": "United States Dollar"
},
"eurName": {
"message": "Euro"
},
"gbpName": {
"message": "British Pound"
},
"jpyName": {
"message": "Japanese Yen"
},
"audName": {
"message": "Australian Dollar"
},
"cadName": {
"message": "Canadian Dollar"
},
"chfName": {
"message": "Swiss Franc"
},
"cnyName": {
"message": "Chinese Yuan"
},
"dkkName": {
"message": "Danish Krone"
},
"hkdName": {
"message": "Hong Kong Dollar"
},
"idrName": {
"message": "Indonesian Rupiah"
},
"inrName": {
"message": "Indian Rupee"
},
"krwName": {
"message": "South Korean Won"
},
"mxnName": {
"message": "Mexican Peso"
},
"nzdName": {
"message": "New Zealand Dollar"
},
"plnName": {
"message": "Polish Zloty"
},
"sekName": {
"message": "Swedish Krona"
},
"sgdName": {
"message": "Singapore Dollar"
},
"thbName": {
"message": "Thai Baht"
},
"tryName": {
"message": "Turkish Lira"
},
"twdName": {
"message": "Taiwan Dollar"
},
"uahName": {
"message": "Ukrainian Hryvnia"
},
"zarName": {
"message": "South African Rand"
}
}
Loading