Skip to content

Commit

Permalink
refactor: welcome page copy
Browse files Browse the repository at this point in the history
  • Loading branch information
fbwoolf committed May 26, 2022
1 parent 544cdd1 commit bf5e8f9
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 26 deletions.
6 changes: 3 additions & 3 deletions src/app/pages/onboarding/welcome/welcome.layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export function WelcomeLayout(props: WelcomeLayoutProps): JSX.Element {
pr={['unset', '80px']}
>
Hiro Wallet connects you to Stacks apps while keeping your account, data, and crypto
secure. Create your Stacks account to get started.
secure.
</Text>
<Box>
<PrimaryButton
Expand All @@ -74,11 +74,11 @@ export function WelcomeLayout(props: WelcomeLayoutProps): JSX.Element {
mt={['base', null, 'loose']}
onClick={onStartOnboarding}
>
Create Stacks Account
Create new wallet
</PrimaryButton>
</Box>
<Stack mt="loose" spacing="tight">
<Caption>Already have a Stacks account?</Caption>
<Caption>Already have a wallet?</Caption>
<Link
data-testid={OnboardingSelectors.SignInLink}
fontSize="14px"
Expand Down
12 changes: 2 additions & 10 deletions tests/integration/balance/balance.spec.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
import {
addAPINetwork,
BrowserDriver,
createTestSelector,
setupBrowser,
} from '@tests/integration/utils';
import { BrowserDriver, createTestSelector, setupBrowser } from '@tests/integration/utils';
import { WalletPage } from '@tests/page-objects/wallet.page';
import { RouteUrls } from '@shared/route-urls';
import { BalanceSelectors } from '@tests/integration/balance.selectors';
Expand All @@ -16,7 +11,7 @@ const getAmount = (stxAmount: string) => {
return stxAmount ? parseFloat(stxAmount.replace(/,/g, '')) : 0;
};

describe(`Wallet Balance integration tests`, () => {
describe(`balance integration tests`, () => {
const BEFORE_ALL_TIMEOUT = 60000;
let browser: BrowserDriver;
let wallet: WalletPage;
Expand All @@ -25,9 +20,6 @@ describe(`Wallet Balance integration tests`, () => {
browser = await setupBrowser();
wallet = await WalletPage.init(browser, RouteUrls.Onboarding);
await wallet.signIn(SECRET_KEY_2);
await wallet.waitForHomePage();
await addAPINetwork(wallet);
await wallet.waitForSendButton();
}, BEFORE_ALL_TIMEOUT);

afterAll(async () => {
Expand Down
28 changes: 15 additions & 13 deletions tests/integration/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { setupMocks } from '../mocks';
import { DemoPage } from '../page-objects/demo.page';
import { WalletPage } from '@tests/page-objects/wallet.page';
import { SettingsSelectors } from '@tests/integration/settings.selectors';
import { NetworkPage } from '@tests/page-objects/network-page';

const makeTmpDir = promisify(mkdtemp);

Expand Down Expand Up @@ -160,15 +159,18 @@ export const timeDifference = (startDate: Date, endDate: Date) => {
return seconds;
};

export const addAPINetwork = async (wallet: WalletPage) => {
await wallet.clickSettingsButton();
await wallet.page.click(createTestSelector(SettingsSelectors.ChangeNetworkAction));
await wallet.page.click(createTestSelector(SettingsSelectors.BtnAddNetwork));
const networkPage: NetworkPage = new NetworkPage(wallet.page);
await networkPage.inputNetworkNameField('api');
await networkPage.inputNetworkAddressField(
process.env.APIEnvVariable || 'https://stacks-node-api-inactive.stacks.co/'
);
await networkPage.inputNetworkKeyField('api');
await networkPage.clickAddNetwork();
};
// TODO: Need to fix this. It is producing an error: `Unable to fetch info from node.`
// I don't even understand why this is being used in a test to check a balance?
//
// export const addAPINetwork = async (wallet: WalletPage) => {
// await wallet.clickSettingsButton();
// await wallet.page.click(createTestSelector(SettingsSelectors.ChangeNetworkAction));
// await wallet.page.click(createTestSelector(SettingsSelectors.BtnAddNetwork));
// const networkPage: NetworkPage = new NetworkPage(wallet.page);
// await networkPage.inputNetworkNameField('api');
// await networkPage.inputNetworkAddressField(
// process.env.APIEnvVariable || 'https://stacks-node-api-inactive.stacks.co/'
// );
// await networkPage.inputNetworkKeyField('api');
// await networkPage.clickAddNetwork();
// };

0 comments on commit bf5e8f9

Please sign in to comment.