Skip to content

Commit

Permalink
TW-1539: Remove Marigold and periodic networks (#1197)
Browse files Browse the repository at this point in the history
* TW-1539 Remove Marigold and periodic networks

* TW-1539 Remove unused functions

* TW-1539 Remove onboarding scenarios from e2e tests

* TW-1539 Remove 'Partners promotion' checkbox mentions from e2e tests
  • Loading branch information
keshan3262 authored Sep 24, 2024
1 parent dd062d9 commit 86ea1ff
Show file tree
Hide file tree
Showing 17 changed files with 9 additions and 198 deletions.
46 changes: 1 addition & 45 deletions e2e/src/features/create-new-wallet.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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


4 changes: 2 additions & 2 deletions e2e/src/features/delegate.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
75 changes: 1 addition & 74 deletions e2e/src/features/import-existing-wallet.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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


4 changes: 2 additions & 2 deletions e2e/src/features/send.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions e2e/src/features/swap.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion e2e/src/features/unlock-screen.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion e2e/src/page-objects/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
2 changes: 0 additions & 2 deletions e2e/src/page-objects/pages/general-settings.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
}
}
4 changes: 0 additions & 4 deletions public/_locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -640,10 +640,6 @@
"message": "Tezos Mainnet",
"description": "Mainnet = main network"
},
"marigoldMainnet": {
"message": "Marigold Mainnet",
"description": "Mainnet = main network"
},
"templeWalletOptions": {
"message": "Temple Wallet | Options"
},
Expand Down
4 changes: 0 additions & 4 deletions public/_locales/en_GB/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -500,10 +500,6 @@
"message": "Tezos Mainnet",
"description": "Mainnet = main network"
},
"marigoldMainnet": {
"message": "Marigold Mainnet",
"description": "Mainnet = main network"
},
"templeWalletOptions": {
"message": "Temple Wallet | Options"
},
Expand Down
4 changes: 0 additions & 4 deletions public/_locales/fr/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -478,10 +478,6 @@
"message": "Mainnet Tezos",
"description": "Mainnet = main network"
},
"marigoldMainnet": {
"message": "Mainnet Marigold",
"description": "Mainnet = main network"
},
"templeWalletOptions": {
"message": "Portefeuille Temple | Options"
},
Expand Down
4 changes: 0 additions & 4 deletions public/_locales/pt/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
4 changes: 0 additions & 4 deletions public/_locales/tr/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
4 changes: 0 additions & 4 deletions public/_locales/uk/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -495,10 +495,6 @@
"message": "Tezos Mainnet",
"description": "Mainnet = main network"
},
"marigoldMainnet": {
"message": "Marigold Mainnet",
"description": "Mainnet = main network"
},
"templeWalletOptions": {
"message": "Temple Wallet | Налаштування"
},
Expand Down
4 changes: 0 additions & 4 deletions public/_locales/zh_CN/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -478,10 +478,6 @@
"message": "Tezos主网",
"description": "Mainnet = main network"
},
"marigoldMainnet": {
"message": "Marigold主网",
"description": "Mainnet = main network"
},
"templeWalletOptions": {
"message": "Temple钱包 | 选项"
},
Expand Down
4 changes: 0 additions & 4 deletions public/_locales/zh_TW/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -478,10 +478,6 @@
"message": "Tezos 主網路",
"description": "Mainnet = main network"
},
"marigoldMainnet": {
"message": "Marigold 主網路",
"description": "Mainnet = main network"
},
"templeWalletOptions": {
"message": "Temple 錢包 | 選項"
},
Expand Down
37 changes: 0 additions & 37 deletions src/lib/temple/networks.ts
Original file line number Diff line number Diff line change
@@ -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<string, string>([
[TempleChainId.Mainnet, 'mainnet'],
[TempleChainId.Ghostnet, 'ghostnet'],
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down

0 comments on commit 86ea1ff

Please sign in to comment.