Skip to content
This repository was archived by the owner on Oct 22, 2024. It is now read-only.

Sync repo 2022-01-31#477

Merged
bergarces merged 3 commits intomainfrom
chore/sync-extension-2022-01-31
Feb 2, 2023
Merged

Sync repo 2022-01-31#477
bergarces merged 3 commits intomainfrom
chore/sync-extension-2022-01-31

Conversation

@bergarces
Copy link
Copy Markdown
Contributor

@bergarces bergarces commented Jan 31, 2023 •
edited
Loading

Updates version of desktop-extension to match current one.

  • Copied import/resolver eslint setting from the extension, so that ui files can reference ts files from the submodule.
  • Updated dependencies and depcheck to match the ones from desktop-extension
  • Playwright versions not updated as there were CircleCI image errors.
  • Lavamoat versions not updates as the ui was erroring even after patching and updating policies (new ticket for this).
  • Removed some audit exclusions.
  • Updated lavamoat policies.
  • Fixed sign up page.
  • Increases timeout and adds delays.

@bergarces bergarces force-pushed the chore/sync-extension-2022-01-31 branch 11 times, most recently from 402e627 to e563558 Compare February 1, 2023 10:57
@socket-security
Copy link
Copy Markdown

socket-security bot commented Feb 1, 2023 •
edited
Loading

Socket Security Pull Request Report

👍 No new dependency issues detected in pull request

Pull request report summary
Issue Status
Install scripts ✅ 0 issues
Native code ✅ 0 issues
Bin script confusion ✅ 0 issues
Bin script shell injection ✅ 0 issues
Unresolved require ✅ 0 issues
Invalid package.json ✅ 0 issues
HTTP dependency ✅ 0 issues
Git dependency ✅ 0 issues
Potential typo squat ✅ 0 issues
Known Malware ✅ 0 issues
Telemetry ✅ 0 issues
Protestware/Troll package ✅ 0 issues
Bot Commands

To ignore an alert, reply with a comment starting with @SocketSecurity ignore followed by a space separated list of package-name@version specifiers. e.g. @SocketSecurity ignore foo@1.0.0 bar@2.4.2

Ignoring: chromedriver@109.0.0, fsevents@1.2.13, playwright@1.23.1, jest@28.1.3, jest@29.4.1, jest-cli@28.1.3, jest-cli@29.4.1

Powered by socket.dev

@bergarces bergarces force-pushed the chore/sync-extension-2022-01-31 branch 7 times, most recently from 2c5eb03 to a5b54bb Compare February 1, 2023 12:32
@bergarces
Copy link
Copy Markdown
Contributor Author

bergarces commented Feb 1, 2023

@SocketSecurity ignore chromedriver@109.0.0 fsevents@1.2.13 @playwright/test@1.30.0 jest@28.1.3 jest@29.4.1

@bergarces
Copy link
Copy Markdown
Contributor Author

bergarces commented Feb 1, 2023

@SocketSecurity ignore jest-cli@28.1.3 jest-cli@29.4.1

@bergarces bergarces force-pushed the chore/sync-extension-2022-01-31 branch from a5b54bb to ab6a7d6 Compare February 1, 2023 13:00
@bergarces
Copy link
Copy Markdown
Contributor Author

bergarces commented Feb 1, 2023

@SocketSecurity ignore playwright@1.23.1

@bergarces bergarces force-pushed the chore/sync-extension-2022-01-31 branch 7 times, most recently from d874625 to a89566e Compare February 2, 2023 12:37
@bergarces bergarces force-pushed the chore/sync-extension-2022-01-31 branch 3 times, most recently from 2d2d1ba to f2be97c Compare February 2, 2023 15:48
bergarces
bergarces commented Feb 2, 2023
View reviewed changes
packages/app/.eslintrc.ui.js
typescript: {
// Always try to resolve types under `<root>/@types` directory even
// it doesn't contain any source code, like `@types/unist`
alwaysTryTypes: true,
Copy link
Copy Markdown
Contributor Author

@bergarces bergarces Feb 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without this, eslint doesn't like us referencing ts files within the ui files.

They have this rule in multiple sections of the extension.

bergarces
bergarces commented Feb 2, 2023
View reviewed changes
packages/app/build/clear-electron-state.sh
if [ -z "$OSTYPE" ]
then
OSTYPE="`uname | tr '[:upper:]' '[:lower:]'`"
fi
Copy link
Copy Markdown
Contributor Author

@bergarces bergarces Feb 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is purely for local Linux setup.

bergarces
bergarces commented Feb 2, 2023
View reviewed changes
packages/app/package.json
"@ensdomains/content-hash": "^2.5.6",
"@ethereumjs/common": "^2.3.1",
"@ethereumjs/tx": "^3.2.1",
"@ethersproject/abi": "^5.5.0",
Copy link
Copy Markdown
Contributor Author

@bergarces bergarces Feb 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added some missing dependencies and upgraded existing ones (except lavamoat and playwright).

@bergarces bergarces force-pushed the chore/sync-extension-2022-01-31 branch from f2be97c to d2350eb Compare February 2, 2023 16:16
@bergarces bergarces marked this pull request as ready for review February 2, 2023 16:16
@bergarces bergarces requested a review from a team February 2, 2023 16:16
@bergarces bergarces force-pushed the chore/sync-extension-2022-01-31 branch from d2350eb to c898f14 Compare February 2, 2023 16:18
bergarces
bergarces commented Feb 2, 2023
View reviewed changes
packages/app/test/playwright/pageObjects/ext-signin-page.ts
async signIn() {
await delay(2000);
await this.goto();
await delay(15000);
Copy link
Copy Markdown
Contributor Author

@bergarces bergarces Feb 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added this delays as this test kept failing in the pipeline.

bergarces
bergarces commented Feb 2, 2023
View reviewed changes
packages/app/playwright.config.ts
const config: PlaywrightTestConfig = {
testDir: `${PW_ROOT_PATH}/specs`,
timeout: 90 * 1000,
timeout: 120 * 1000,
Copy link
Copy Markdown
Contributor Author

@bergarces bergarces Feb 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some tests were failing due to timeout on teardown.

matthewwalsh0
matthewwalsh0 reviewed Feb 2, 2023
View reviewed changes
@bergarces bergarces force-pushed the chore/sync-extension-2022-01-31 branch from c898f14 to 07db45c Compare February 2, 2023 16:29
@bergarces bergarces force-pushed the chore/sync-extension-2022-01-31 branch from 07db45c to b052b95 Compare February 2, 2023 16:58
@bergarces bergarces merged commit 13db532 into main Feb 2, 2023
@cryptotavares cryptotavares mentioned this pull request Mar 1, 2023
Merged
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers

@cryptotavares cryptotavares cryptotavares approved these changes

@matthewwalsh0 matthewwalsh0 matthewwalsh0 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@bergarces @cryptotavares @matthewwalsh0 @racitores