refactor: removed newAccount param from setupWallet

agoric-labs · Jun 10, 2024 · b22be79 · b22be79
1 parent 6aaee51
commit b22be79
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 24 deletions.
diff --git a/commands/keplr.js b/commands/keplr.js
@@ -178,31 +178,20 @@ const keplr = {
  async importWallet(
  secretWordsOrPrivateKey,
  password,
- newAccount,
  walletName,
  selectedChains,
  ) {
  await module.exports.goToRegistration();
  await playwright.waitAndClickByText(
- newAccount
- ? onboardingElements.createWalletButton
- : onboardingElements.existingWalletButton,
+ onboardingElements.existingWalletButton,
  await playwright.keplrWindow(),
  );
 
  await playwright.waitAndClickByText(
- newAccount
- ? onboardingElements.importRecoveryPhraseButton
- : onboardingElements.useRecoveryPhraseButton,
+ onboardingElements.useRecoveryPhraseButton,
  await playwright.keplrWindow(),
  );
 
- newAccount &&
- (await playwright.waitAndClickByText(
- onboardingElements.useRecoveryPhraseButton,
- await playwright.keplrWindow(),
- ));
-
  if (secretWordsOrPrivateKey.includes(' ')) {
  await module.exports.importWalletWithPhrase(
  secretWordsOrPrivateKey,
@@ -377,7 +366,6 @@ const keplr = {
  {
  secretWordsOrPrivateKey,
  password,
- newAccount,
  walletName,
  selectedChains,
  createNewWallet,
@@ -398,7 +386,6 @@ const keplr = {
  await module.exports.importWallet(
  secretWordsOrPrivateKey,
  password,
- newAccount,
  walletName,
  selectedChains,
  );

diff --git a/pages/keplr/first-time-flow-page.js b/pages/keplr/first-time-flow-page.js
@@ -1,6 +1,5 @@
 const createWalletButton = 'Create a new wallet';
 const existingWalletButton = 'Import an existing wallet';
-const importRecoveryPhraseButton = 'Import existing recovery phrase';
 const createNewRecoveryPhraseButton = 'Create new recovery phrase';
 const showMyPhraseButton = 'I understood. Show my phrase.';
 const copyToClipboardButton = 'Copy to clipboard';
@@ -24,7 +23,6 @@ const importButtonSelector = 'button:has-text("Import")';
 module.exports.onboardingElements = {
  existingWalletButton,
  createWalletButton,
- importRecoveryPhraseButton,
  createNewRecoveryPhraseButton,
  showMyPhraseButton,
  copyToClipboardButton,

diff --git a/plugins/keplr-plugin.js b/plugins/keplr-plugin.js
@@ -97,15 +97,13 @@ module.exports = (on, config) => {
  setupWallet: async ({
  secretWordsOrPrivateKey,
  password,
- newAccount,
  walletName,
  selectedChains,
  createNewWallet,
  }) => {
  await keplr.initialSetup(null, {
  secretWordsOrPrivateKey,
  password,
- newAccount,
  walletName,
  selectedChains,
  createNewWallet,

diff --git a/support/commands.js b/support/commands.js
@@ -415,7 +415,6 @@ Cypress.Commands.add('setupWallet', (args = {}) => {
  secretWords,
  privateKey,
  password = 'Test1234',
- newAccount = false,
  walletName = 'My Wallet',
  selectedChains = [],
  createNewWallet = false,
@@ -426,7 +425,6 @@ Cypress.Commands.add('setupWallet', (args = {}) => {
  privateKey ||
  'orbit bench unit task food shock brand bracket domain regular warfare company announce wheel grape trust sphere boy doctor half guard ritual three ecology',
  password,
- newAccount,
  walletName,
  selectedChains,
  createNewWallet,

diff --git a/support/index.d.ts b/support/index.d.ts
@@ -518,7 +518,6 @@ declare namespace Cypress {
  secretWords?: string;
  privateKey?: string;
  password?: string;
- newAccount?: boolean;
  walletName?: string;
  selectedChains?: Array<string>;
  createNewWallet?: boolean;

diff --git a/tests/e2e/specs/keplr/keplr-spec.js b/tests/e2e/specs/keplr/keplr-spec.js
@@ -86,12 +86,11 @@ describe('Keplr', () => {
  'Offer accepted',
  );
  });
- it(`should create a new wallet using 24 word phrase`, () => {
+ it(`should import a wallet and add selected chains`, () => {
  cy.setupWallet({
  secretWords:
  'orbit bench unit task food shock brand bracket domain regular warfare company announce wheel grape trust sphere boy doctor half guard ritual three ecology',
  password: 'Test1234',
- newAccount: true,
  walletName: 'My Wallet 2',
  selectedChains: ['Agoric localhost', 'Secret Network'],
  }).then(setupFinished => {