diff --git a/e2e/src/features/create-new-wallet.feature b/e2e/src/features/create-new-wallet.feature index 27a11578c2..df4fabd330 100644 --- a/e2e/src/features/create-new-wallet.feature +++ b/e2e/src/features/create-new-wallet.feature @@ -19,7 +19,6 @@ Feature: Create a new wallet And I enter defaultPassword into Password Field on the Register Form page And I enter defaultPassword into Repeat Password Field on the Register Form page And I press Analytics Check Box on the Register Form page - And I press Skip Onboarding Checkbox on the Register Form page And I press Accept Terms Checkbox on the Register Form page And I press Create Button on the Register Form page @@ -32,49 +31,6 @@ Feature: Create a new wallet Then I am on the Home page -@create_new_wallet - Scenario: As a user, I'd like to create a wallet and pass on-boarding - Given I am on the Welcome page - And I press Create New Wallet button on the Welcome page - - And I am on the NewSeedBackup page - And I press Protected Mask on the New Seed Back-up page - And I save my mnemonic - And I press I made Seed Phrase Backup Check Box on the New Seed Back-up page - And I press Next Button on the New Seed Back-up page - - And I am on the VerifyMnemonic page - And I verify my mnemonic - And I press Next Button on the New Seed Verify page - - And I am on the SetWallet page - And I enter defaultPassword into Password Field on the Register Form page - And I enter defaultPassword into Repeat Password Field on the Register Form page - And I press Analytics Check Box on the Register Form page - And I press Accept Terms Checkbox on the Register Form page - And I press Create Button on the Register Form page -# On-boarding passing - And I am on the OnboardingFirstStep page - And I press Next Button on the Onboarding (First Step) page - - And I am on the OnboardingSecondStep page - And I press Next Button on the Onboarding (Second Step) page - - And I am on the OnboardingThirdStep page - And I press Next Button on the Onboarding (Third Step) page - - And I am on the OnboardingFourthStep page - And I press Done Button on the Onboarding (Fourth Step) page - - And I am on the OnboardingCongrats page - And I press Start Button on the Onboarding (Congrats) page - - And I am on the OnRumpModal page - And I press Close Button on the On-ramp Modal page - - And I am on the NewsletterModal page - And I press Close Button on the Newsletter Modal page - - Then I am on the Home page +# TODO: add a scenario for passing an onboarding diff --git a/e2e/src/features/delegate.feature b/e2e/src/features/delegate.feature index 55cfdf43b0..153d998cc4 100644 --- a/e2e/src/features/delegate.feature +++ b/e2e/src/features/delegate.feature @@ -4,8 +4,8 @@ Feature: Delegate Scenario: As a user, i'd like to re-delegate TEZ to a baker Given I have imported an existing account And I press Selected Network Button on the Header page - And I select Marigold Mainnet node in the networks drop-down list on the Header page - And I check that Marigold Mainnet node is selected correctly + And I select Tezos Mainnet node in the networks drop-down list on the Header page + And I check that Tezos Mainnet node is selected correctly And I press Asset Item Apy Button on the Assets page And I am on the DelegateTab page diff --git a/e2e/src/features/import-existing-wallet.feature b/e2e/src/features/import-existing-wallet.feature index 4091f0f5a4..d73d7de289 100644 --- a/e2e/src/features/import-existing-wallet.feature +++ b/e2e/src/features/import-existing-wallet.feature @@ -12,7 +12,6 @@ Feature: Import existing wallet And I am on the SetWallet page And I enter defaultPassword into Password Field on the Register Form page And I enter defaultPassword into Repeat Password Field on the Register Form page - And I press Skip Onboarding Checkbox on the Register Form page And I press Analytics Check Box on the Register Form page And I press Accept Terms Checkbox on the Register Form page And I press Import Button on the Register Form page @@ -24,78 +23,6 @@ Feature: Import existing wallet - Scenario: As a user, I'd like to import wallet and pass on-boarding [Positive] - Given I am on the Welcome page - And I press Import Existing Wallet button on the Welcome page - - And I am on the ImportExistingWallet page - And I enter defaultSeedPhrase mnemonic on the ImportExistingWallet page - And I press Next button on the Import Existing Seed Phrase page - - And I am on the SetWallet page - And I enter defaultPassword into Password Field on the Register Form page - And I enter defaultPassword into Repeat Password Field on the Register Form page - And I press Analytics Check Box on the Register Form page - And I press Accept Terms Checkbox on the Register Form page - And I press Import Button on the Register Form page - - # On-boarding passing - And I am on the OnboardingFirstStep page - And I press Next Button on the Onboarding (First Step) page - - And I am on the OnboardingSecondStep page - And I press Next Button on the Onboarding (Second Step) page - - And I am on the OnboardingThirdStep page - And I press Next Button on the Onboarding (Third Step) page - - And I am on the OnboardingFourthStep page - And I press Done Button on the Onboarding (Fourth Step) page - - And I am on the OnboardingCongrats page - And I press Start Button on the Onboarding (Congrats) page - - And I am on the NewsletterModal page - And I press Close Button on the Newsletter Modal page - - Then I am on the Home page - - - Scenario: As a user, I'd like to switch between onboarding pages and skip it [Negative] - Given I am on the Welcome page - And I press Import Existing Wallet button on the Welcome page - - And I am on the ImportExistingWallet page - And I enter defaultSeedPhrase mnemonic on the ImportExistingWallet page - And I press Next button on the Import Existing Seed Phrase page - - And I am on the SetWallet page - And I enter defaultPassword into Password Field on the Register Form page - And I enter defaultPassword into Repeat Password Field on the Register Form page - And I press Analytics Check Box on the Register Form page - And I press Accept Terms Checkbox on the Register Form page - And I press Import Button on the Register Form page - - # On-boarding passing - And I am on the OnboardingFirstStep page - And I press Next Button on the Onboarding (First Step) page - - And I am on the OnboardingSecondStep page - And I press Next Button on the Onboarding (Second Step) page - - And I am on the OnboardingThirdStep page - And I press Next Button on the Onboarding (Third Step) page - - And I am on the OnboardingFourthStep page - # Returning to the previous page - And I press Back Button on the Page Layout page - - And I am on the OnboardingThirdStep page - And I press Skip Button on the Page Layout page - - And I am on the NewsletterModal page - And I press Close Button on the Newsletter Modal page - - Then I am on the Home page + # TODO: add scenarios for passing onboarding diff --git a/e2e/src/features/send.feature b/e2e/src/features/send.feature index 39211d49a0..9d1b46cfad 100644 --- a/e2e/src/features/send.feature +++ b/e2e/src/features/send.feature @@ -4,8 +4,8 @@ Feature: Send Scenario: As a user, I'd like to send my funds to another account Given I have imported an existing account And I press Selected Network Button on the Header page - And I select Marigold Mainnet node in the networks drop-down list on the Header page - And I check that Marigold Mainnet node is selected correctly + And I select Tezos Mainnet node in the networks drop-down list on the Header page + And I check that Tezos Mainnet node is selected correctly And I press Send Button on the Home page And I am on the Send page diff --git a/e2e/src/features/swap.feature b/e2e/src/features/swap.feature index 3ae553b91f..2ef9a459d8 100644 --- a/e2e/src/features/swap.feature +++ b/e2e/src/features/swap.feature @@ -4,8 +4,8 @@ Feature: Swap Scenario: As a user, i'd like to swap assets Given I have imported an existing account And I press Selected Network Button on the Header page - And I select Marigold Mainnet node in the networks drop-down list on the Header page - And I check that Marigold Mainnet node is selected correctly + And I select Tezos Mainnet node in the networks drop-down list on the Header page + And I check that Tezos Mainnet node is selected correctly And I press Swap Button on the Home page And I am on the Swap page diff --git a/e2e/src/features/unlock-screen.feature b/e2e/src/features/unlock-screen.feature index ad4d773ff9..7365488d95 100644 --- a/e2e/src/features/unlock-screen.feature +++ b/e2e/src/features/unlock-screen.feature @@ -131,7 +131,6 @@ Feature: Unlock Screen And I got the 'Attention!' warning with Alert title Text element on the Alert page And I enter defaultPassword into Password Field on the Register Form page And I enter defaultPassword into Repeat Password Field on the Register Form page - And I press Skip Onboarding Checkbox on the Register Form page And I press Analytics Check Box on the Register Form page And I press Accept Terms Checkbox on the Register Form page And I press Import Button on the Register Form page diff --git a/e2e/src/page-objects/index.ts b/e2e/src/page-objects/index.ts index 3d417a27ef..387d32b31e 100644 --- a/e2e/src/page-objects/index.ts +++ b/e2e/src/page-objects/index.ts @@ -47,7 +47,7 @@ import { UnlockScreenPage } from './pages/unlock-screen.page'; import { VerifyMnemonicPage } from './pages/verify-mnemonic.page'; import { WelcomePage } from './pages/welcome.page'; - +// TODO: add a page for advanced settings export const Pages = { Welcome: new WelcomePage(), ImportExistingWallet: new ImportExistingWalletPage(), diff --git a/e2e/src/page-objects/pages/general-settings.page.ts b/e2e/src/page-objects/pages/general-settings.page.ts index 7727364886..e25f4e217b 100644 --- a/e2e/src/page-objects/pages/general-settings.page.ts +++ b/e2e/src/page-objects/pages/general-settings.page.ts @@ -14,7 +14,6 @@ export class GeneralSettingsPage extends Page { extensionLockUpCheckBox = createPageElement(SettingsGeneralSelectors.extensionLockUpCheckBox); anonymousAnalyticsCheckBox = createPageElement(SettingsGeneralSelectors.anonymousAnalyticsCheckBox); notificationCheckBox = createPageElement(SettingsGeneralSelectors.notificationCheckBox); - partnersPromotion = createPageElement(SettingsGeneralSelectors.partnersPromotion); async isVisible() { await this.languageDropDown.waitForDisplayed(); @@ -24,6 +23,5 @@ export class GeneralSettingsPage extends Page { await this.extensionLockUpCheckBox.waitForDisplayed(); await this.anonymousAnalyticsCheckBox.waitForDisplayed(); await this.notificationCheckBox.waitForDisplayed(); - await this.partnersPromotion.waitForDisplayed(); } } diff --git a/public/_locales/en/messages.json b/public/_locales/en/messages.json index 3d7d5dc1e0..613ff289ec 100644 --- a/public/_locales/en/messages.json +++ b/public/_locales/en/messages.json @@ -640,10 +640,6 @@ "message": "Tezos Mainnet", "description": "Mainnet = main network" }, - "marigoldMainnet": { - "message": "Marigold Mainnet", - "description": "Mainnet = main network" - }, "templeWalletOptions": { "message": "Temple Wallet | Options" }, diff --git a/public/_locales/en_GB/messages.json b/public/_locales/en_GB/messages.json index 35c75fedda..50f45b3046 100644 --- a/public/_locales/en_GB/messages.json +++ b/public/_locales/en_GB/messages.json @@ -500,10 +500,6 @@ "message": "Tezos Mainnet", "description": "Mainnet = main network" }, - "marigoldMainnet": { - "message": "Marigold Mainnet", - "description": "Mainnet = main network" - }, "templeWalletOptions": { "message": "Temple Wallet | Options" }, diff --git a/public/_locales/fr/messages.json b/public/_locales/fr/messages.json index f51020583d..2feeb727a0 100644 --- a/public/_locales/fr/messages.json +++ b/public/_locales/fr/messages.json @@ -478,10 +478,6 @@ "message": "Mainnet Tezos", "description": "Mainnet = main network" }, - "marigoldMainnet": { - "message": "Mainnet Marigold", - "description": "Mainnet = main network" - }, "templeWalletOptions": { "message": "Portefeuille Temple | Options" }, diff --git a/public/_locales/pt/messages.json b/public/_locales/pt/messages.json index b1741fb955..e8f917217d 100644 --- a/public/_locales/pt/messages.json +++ b/public/_locales/pt/messages.json @@ -496,10 +496,6 @@ "message": "Tezos Mainnet", "description": "Mainnet = main network" }, - "marigoldMainnet": { - "message": "Marigold Mainnet", - "description": "Mainnet = main network" - }, "templeWalletOptions": { "message": "Carteira Temple | Opções" }, diff --git a/public/_locales/tr/messages.json b/public/_locales/tr/messages.json index de50af2158..5cfae74055 100644 --- a/public/_locales/tr/messages.json +++ b/public/_locales/tr/messages.json @@ -496,10 +496,6 @@ "message": "Tezos Mainnet", "description": "Mainnet = main network" }, - "marigoldMainnet": { - "message": "Marigold Mainnet", - "description": "Mainnet = main network" - }, "templeWalletOptions": { "message": "Temple Wallet | Seçenekler" }, diff --git a/public/_locales/uk/messages.json b/public/_locales/uk/messages.json index e8979a6327..24ff92d46a 100644 --- a/public/_locales/uk/messages.json +++ b/public/_locales/uk/messages.json @@ -495,10 +495,6 @@ "message": "Tezos Mainnet", "description": "Mainnet = main network" }, - "marigoldMainnet": { - "message": "Marigold Mainnet", - "description": "Mainnet = main network" - }, "templeWalletOptions": { "message": "Temple Wallet | Налаштування" }, diff --git a/public/_locales/zh_CN/messages.json b/public/_locales/zh_CN/messages.json index d48989faef..9df70b1854 100644 --- a/public/_locales/zh_CN/messages.json +++ b/public/_locales/zh_CN/messages.json @@ -478,10 +478,6 @@ "message": "Tezos主网", "description": "Mainnet = main network" }, - "marigoldMainnet": { - "message": "Marigold主网", - "description": "Mainnet = main network" - }, "templeWalletOptions": { "message": "Temple钱包 | 选项" }, diff --git a/public/_locales/zh_TW/messages.json b/public/_locales/zh_TW/messages.json index ca59167a09..1e0bd7242f 100644 --- a/public/_locales/zh_TW/messages.json +++ b/public/_locales/zh_TW/messages.json @@ -478,10 +478,6 @@ "message": "Tezos 主網路", "description": "Mainnet = main network" }, - "marigoldMainnet": { - "message": "Marigold 主網路", - "description": "Mainnet = main network" - }, "templeWalletOptions": { "message": "Temple 錢包 | 選項" }, diff --git a/src/lib/temple/networks.ts b/src/lib/temple/networks.ts index c9561bbee3..0cc3ee4180 100644 --- a/src/lib/temple/networks.ts +++ b/src/lib/temple/networks.ts @@ -1,15 +1,5 @@ import { TempleChainId, TempleNetwork } from 'lib/temple/types'; -const formatDateToRPCFormat = (date: Date) => date.toLocaleDateString('en-GB').split('/').reverse().join('-'); - -const getLastMonday = (date = new Date()) => { - const dateCopy = new Date(date.getTime() - 604800000); - - const nextMonday = new Date(dateCopy.setDate(dateCopy.getDate() + ((7 - dateCopy.getDay() + 1) % 7 || 7))); - - return formatDateToRPCFormat(nextMonday); -}; - export const NETWORK_IDS = new Map([ [TempleChainId.Mainnet, 'mainnet'], [TempleChainId.Ghostnet, 'ghostnet'], @@ -48,15 +38,6 @@ export const NETWORKS: TempleNetwork[] = [ color: '#83b300', disabled: false }, - { - id: 'marigold-mainnet', - nameI18nKey: 'marigoldMainnet', - description: 'Marigold mainnet', - type: 'main', - rpcBaseURL: 'https://mainnet.tezos.marigold.dev', - color: '#48bb78', - disabled: false - }, { id: 'smartpy-mainnet', name: 'SmartPy Mainnet', @@ -85,24 +66,6 @@ export const NETWORKS: TempleNetwork[] = [ color: '#131380', disabled: false }, - { - id: 'monday', - name: 'MondayNet Testnet', - description: `MondayNet ${getLastMonday()}`, - type: 'test', - rpcBaseURL: `https://rpc.mondaynet-${getLastMonday()}.teztnets.xyz/`, - color: '#FBBF24', - disabled: false - }, - { - id: 'daily', - name: 'DailyNet Testnet', - description: 'DailyNet', - type: 'test', - rpcBaseURL: `https://rpc.dailynet-${formatDateToRPCFormat(new Date())}.teztnets.xyz/`, - color: '#FBBF24', - disabled: false - }, { id: 'sandbox', name: 'localhost:8732',