Release 1.27 (#1210)

Merge pull request #1210 from madfish-solutions/development

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
 
 

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

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
 
 

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

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

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

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(),

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();
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "temple-wallet",
-  "version": "1.26.1",
+  "version": "1.27.0",
   "private": true,
   "scripts": {
     "start-run": "cross-env TS_NODE_PROJECT=\"webpack/tsconfig.json\" webpack --watch --stats errors-warnings",
@@ -231,6 +231,6 @@
     "follow-redirects": "^1.15.4"
   },
   "optionalDependencies": {
-    "@temple-wallet/extension-ads": "8.1.1"
+    "@temple-wallet/extension-ads": "9.0.0-dev.2"
   }
 }

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"
   },
@@ -1099,7 +1095,7 @@
     "message": "Earn"
   },
   "delegationPointsHead2": {
-    "message": "on your Tezos annualy from\nBaking & Stake rewards"
+    "message": "on your Tezos annually from\nBaking & Stake rewards"
   },
   "delegationPoint1": {
     "message": "First reward in Tezos will be paid approximately in 36 days."
@@ -3115,7 +3111,12 @@
     "message": "Cashback"
   },
   "swapCashbackDescription": {
-    "message": "Swap more than 10$ and receive 0.175% from the swapped amount in the TKEY token as a cashback"
+    "message": "Swap more than 10$$ and receive $text$% from the swapped amount in the TKEY token as a cashback",
+    "placeholders": {
+      "text": {
+        "content": "$1"
+      }
+    }
   },
   "jumpInTezos": {
     "message": "Jump in Tezos right now!"

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"
   },
@@ -1780,7 +1776,12 @@
     "message": "Cashback"
   },
   "swapCashbackDescription": {
-    "message": "Swap more than 10$ and receive 0.175% from the swapped amount in the TKEY token as a cashback"
+    "message": "Swap more than 10$$ and receive $text$% from the swapped amount in the TKEY token as a cashback",
+    "placeholders": {
+      "text": {
+        "content": "$1"
+      }
+    }
   },
   "subscribeToNewsletter": {
     "message": "Subscribe to our Newsletter"

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"
   },

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"
   },

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"
   },

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 | Налаштування"
   },

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钱包 | 选项"
   },

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 錢包 | 選項"
   },

src/app/pages/Staking/MyStake.tsx

@@ -164,7 +164,7 @@ export const MyStakeTab = memo(() => {
                   className="h-10"
                   onClick={finalizeUnstake}
                 >
-                  Unstake
+                  Finalize
                 </FormSubmitButton>
               </>
             ) : requestsAreLoading ? (

src/app/templates/SwapForm/SwapForm.tippy.ts

@@ -1,4 +1,5 @@
 import { t } from 'lib/i18n';
+import { SWAP_CASHBACK_PERCENT } from 'lib/route3/constants';
 
 export const feeInfoTippyProps = {
   trigger: 'mouseenter',
@@ -10,6 +11,6 @@ export const feeInfoTippyProps = {
 export const cashbackInfoTippyProps = {
   trigger: 'mouseenter',
   hideOnClick: false,
-  content: t('swapCashbackDescription'),
+  content: t('swapCashbackDescription', [SWAP_CASHBACK_PERCENT]) as string,
   animation: 'shift-away-subtle'
 };

src/app/templates/SwapForm/SwapForm.tsx

@@ -31,12 +31,13 @@ import {
   ROUTING_FEE_SLIPPAGE_RATIO,
   SWAP_THRESHOLD_TO_GET_CASHBACK,
   TEMPLE_TOKEN,
-  ATOMIC_INPUT_THRESHOLD_FOR_FEE_FROM_INPUT
+  ATOMIC_INPUT_THRESHOLD_FOR_FEE_FROM_INPUT,
+  ROUTING_FEE_PERCENT,
+  SWAP_CASHBACK_PERCENT
 } from 'lib/route3/constants';
 import { isLiquidityBakingParamsResponse } from 'lib/route3/interfaces';
 import { getPercentageRatio } from 'lib/route3/utils/get-percentage-ratio';
 import { getRoute3TokenBySlug } from 'lib/route3/utils/get-route3-token-by-slug';
-import { ROUTING_FEE_PERCENT, SWAP_CASHBACK_PERCENT } from 'lib/swap-router/config';
 import { useAccount, useTezos } from 'lib/temple/front';
 import { atomsToTokens, tokensToAtoms } from 'lib/temple/helpers';
 import useTippy from 'lib/ui/useTippy';