Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge-develop-to-public #819

Merged
merged 101 commits into from
Apr 25, 2024
Merged

Conversation

teebszet
Copy link
Member

Created by merge-to-remote.sh

dhriaznov and others added 30 commits March 11, 2024 19:45
… the extension (#86)

* [ENG-3477] feat: Open the onboarding screen right after user installs the extension

* Use the ui-library/button component instead of the ActionButton

* Remove the tabs permission from the manifest config

* Remove the custom old button styles

* Fix the onboarding animation container

* Improve the account restore/creation flow accessibility
)

* [ENG-3937] Replace the old STX logo leftovers on the web-extension

* Update the styled components names
…ess (#133)

* fix: remove satributes component from receive section in payment address

* chore: fix logic

* chore: fix logic for all cases
* Add sighash none warning

* Fix spacing

---------

Co-authored-by: Den <[email protected]>
…alert (#97)

* [ENG-3340] feat: Add UI warning about the Non default sighash Ledger alert

* Fix tooltip hiding

* Update the info message copy

* Create a separate LedgerStepView component

* Remove the unused imports

* Remove the Steps enum duplicate
- install playwright and dependencies
- create basic healthcheck ui test
- setup github action workflow to execute all UI tests (playwright.yml)
- add healthcheck to build.yml
- add basic folder structure for UI test suite
- add documentation to execute UI tests
- add env. file comment to the setup documentation
- Apply suggestions from code review
…panel-events-for-featured-apps-in-the-extension

[ENG-3842] feat: Add the mixpanel events for featured apps in the extension
* release: v0.31.0

* RPC Wallet Api & BTC handlers (#85)

* WIP: Inject Xverse Webbtc_provider and add request method

* refactor dom event names

* fix send back wallet response

* Start adding stacks request types

* Add placeholders for stx rpc calls

* Sort methods alphabetically

* Reword key RPC methods and types

* Revert "Start adding stacks request types"

This reverts commit 6afcacd.

* update sats-connect version and init rpc handlers

* rebase fixes

* fix duplicate type

* Move helper function out of legacy code

* BTC RPC handlers (#92)

* handle getAddresses request

* WIP Add Support for BTC RPC Methods

* added error request component and refactor psbt request

* separate stx and btc signMessage screens

* update hooks file structure

* return errors as resolved promises instead of rejecting

* update btcAddressRequest hook

* update request handling hooks

* add ledger ui for btc signMessage screen

* chore: bump core to 11.2.0

* chore: remove unnecessary type default

* fix: type errors

---------

Co-authored-by: Eduard Bardají Puig <[email protected]>
Co-authored-by: Tim Man <[email protected]>

* [ENG-3844][ENG-3845][ENG-3850][ENG-3851] stx_callContract, stx_transferStx, stx_getAccounts, stx_getAddresses (#112)

* Add placeholders for stx rpc handlers

* Move helpers to own file

* Remove unused

* Add various changes related to request handling

* Add rpc method param for transaction request type differentiation

* Add response message

* Add rpc method to request params

* Provide rpc response based on rpc call method

* Handle missing function args

* Move error messages to constants

* Add missing rpc method

* Remove unnecessary type

* Refine variable name

* Prevent unknown errors from blocking navigation

* Add rpc props

* Remove unnecessary conditional

* Send rpc response after broadcast

* Start updating ContractCall to RPC request

* Handle contract deploy request

* Update rpc response type

* Add rpc props

* Remove sign message work from this branch

* Simplify request handling

* Rename file

* Add handler and helpers for contractCall

* Rename handler file

* Update hook to handle callContract

* Perform minor tweaks for callContract

* fix: updated sats connect version and stacks methods names

* feat: handle stx_transferStx method

* Use Zod union

* Fix minor issues

* Add stx_getAccounts and stx_getAddresses method handlers

* Update the handleGetStxAccounts method

* Update types

* Remove unimplemented methods

* Refactor send message helpers

* Update params type

* Remove unused prop

* Move messages to translation file

* Add useMemo and useCallback to accounts and address fetching hooks

* Refactor the getAppIconFromWebManifest fetching

* Refactor the getAppIconFromWebManifest fetching useEffect

* Use existing payload format

* Move hook close to component using it

* Replace the ternary return with if statement

---------

Co-authored-by: Abdul Haseeb <[email protected]>
Co-authored-by: Denys Hriaznov <[email protected]>

* fix amount conversion

* close sendTransfer popup after tx_broadcasted

* [ENG-3860] chore: remove name palindrome support (#104)

* chore: use beta core version for testing

* chore: be more strict with typing as in mobile repo

* chore: bump to xverse-core 11.2.0

* Stacks RPC method: `stx_signTransaction` (#100)

* Handle stx token transfer sign tx reqs

* Hande tx signing for deploy contract

* Use payload type checker

* Update params stx_getAccounts (#121)

* Update params stx_getAccounts

* Add user cancellation handling

* Update params stx_getAddresses (#122)

* Eng 3846 stx signmessage (#119)

* WIP: Update Stacks Message signing and refactor signature screen

* added rpc response handling

* disable structured message signing for rpc

* update signature hook dependency params

* Update to sats-connect v2 (#123)

* Chore/return supported methods (#120)

* return supported methods for getInfo

* Add keys transformer to prod loaders

---------

Co-authored-by: Eduard Bardají Puig <[email protected]>

* Support stx_deployContract

* Update sats-connect version

* [ENG-3847] Update stx_signStructuredMessage handling (#131)

* Update stx_signStructuredMessage handling

* Rename file

* Update renamed file path

* added support for get accounts request

* ui improvements

* remove methods automatic generation

* Squashed commit of the following:

commit 66fafe6
Author: Den <[email protected]>
Date:   Mon Mar 25 06:52:07 2024 +0100

    [ENG-3340] feat: Add UI warning about the Non default sighash Ledger alert (#97)

    * [ENG-3340] feat: Add UI warning about the Non default sighash Ledger alert

    * Fix tooltip hiding

    * Update the info message copy

    * Create a separate LedgerStepView component

    * Remove the unused imports

    * Remove the Steps enum duplicate

commit 59ae427
Author: Victor Kirov <[email protected]>
Date:   Mon Mar 25 06:56:11 2024 +0200

    Add sighash none warning (#152)

    * Add sighash none warning

    * Fix spacing

    ---------

    Co-authored-by: Den <[email protected]>

commit 5759028
Author: Den <[email protected]>
Date:   Mon Mar 25 05:36:10 2024 +0100

    [ENG-3972] fix: Issue with balance sip-10 tokens fiat value does not add up to the total balance (#151)

commit a62315f
Author: fede erbes <[email protected]>
Date:   Mon Mar 25 05:02:46 2024 +0100

    fix: qr config, avoid hiding dots covered by image (#154)

commit 3980cae
Author: fede erbes <[email protected]>
Date:   Mon Mar 25 04:50:16 2024 +0100

    fix: remove satributes component from receive section in payment address (#133)

    * fix: remove satributes component from receive section in payment address

    * chore: fix logic

    * chore: fix logic for all cases

commit 6c08ff9
Author: Den <[email protected]>
Date:   Mon Mar 25 04:49:04 2024 +0100

    [ENG-3937] Replace the old STX logo leftovers on the web-extension (#143)

    * [ENG-3937] Replace the old STX logo leftovers on the web-extension

    * Update the styled components names

commit 10653d1
Author: Den <[email protected]>
Date:   Thu Mar 21 11:10:40 2024 +0100

    [ENG-3477] feat: Open the onboarding screen right after user installs the extension (#86)

    * [ENG-3477] feat: Open the onboarding screen right after user installs the extension

    * Use the ui-library/button component instead of the ActionButton

    * Remove the tabs permission from the manifest config

    * Remove the custom old button styles

    * Fix the onboarding animation container

    * Improve the account restore/creation flow accessibility

commit 45cf27e
Merge: 5454e94 4054f22
Author: Tim Man <[email protected]>
Date:   Tue Mar 19 16:07:15 2024 +0800

    Merge pull request #148 from secretkeylabs/release/v0.32.3

    release: v0.32.3 to develop

commit 4054f22
Merge: edd60ed 2db9d91
Author: fede erbes <[email protected]>
Date:   Mon Mar 18 18:21:31 2024 +0100

    Merge branch 'main' into release/v0.32.3

commit edd60ed
Author: GitHub Actions Bot <>
Date:   Mon Mar 18 17:20:22 2024 +0000

    release: v0.32.3

commit 5454e94
Author: fede erbes <[email protected]>
Date:   Mon Mar 18 18:19:35 2024 +0100

    chore: restore max button in send btc flow (#146)

    * chore: restore max button in send btc flow

    * chore: use release core v13.0.0

commit e07287f
Merge: 895c89a dfe4fd2
Author: fede erbes <[email protected]>
Date:   Mon Mar 18 11:51:59 2024 +0100

    Merge pull request #144 from secretkeylabs/release/v0.32.2-mirror

    Hotfix: v0.32.2

commit dfe4fd2
Merge: 9371643 895c89a
Author: Tim Man <[email protected]>
Date:   Mon Mar 18 12:16:08 2024 +0800

    Merge branch 'develop' into release/v0.32.2-mirror

commit 2db9d91
Merge: da0c803 9371643
Author: Tim Man <[email protected]>
Date:   Mon Mar 18 12:15:40 2024 +0800

    Merge pull request #145 from secretkeylabs/release/v0.32.2-mirror

    Hotfix: v0.32.2

commit 895c89a
Merge: 0782b5c ea9a07f
Author: Tim Man <[email protected]>
Date:   Mon Mar 18 12:12:53 2024 +0800

    Merge pull request #140 from secretkeylabs/release/v0.32.1

    release: v0.32.1 to develop

commit da0c803
Merge: 166ada9 ea9a07f
Author: Tim Man <[email protected]>
Date:   Mon Mar 18 12:12:38 2024 +0800

    Merge pull request #139 from secretkeylabs/release/v0.32.1

    release: v0.32.1 to main

commit 9371643
Author: fede erbes <[email protected]>
Date:   Fri Mar 15 18:47:23 2024 -0300

    chore: disable max button and bump version

commit ea9a07f
Merge: 723aec8 166ada9
Author: Tim Man <[email protected]>
Date:   Fri Mar 15 12:09:27 2024 +0800

    Merge branch 'main' into release/v0.32.1

commit 723aec8
Author: GitHub Actions Bot <>
Date:   Fri Mar 15 04:08:50 2024 +0000

    release: v0.32.1

commit 166ada9
Merge: 6a8671f d7c9170
Author: Tim Man <[email protected]>
Date:   Thu Mar 14 23:56:42 2024 +0800

    Merge pull request #125 from secretkeylabs/release/v0.32.0

    release: v0.32.0 to main

* Revert "Squashed commit of the following:"

This reverts commit 6da6efe.

* use wallet methods for btc_providers entry

* hardcode supported methods

* display a dapp provided message for getAccounts request

* update getAccounts to require a purpose passed

* update sats-connect version

* chore: bump to [email protected]

---------

Co-authored-by: GitHub Actions Bot <>
Co-authored-by: Tim Man <[email protected]>
Co-authored-by: Eduard Bardají Puig <[email protected]>
Co-authored-by: Abdul Haseeb <[email protected]>
Co-authored-by: Denys Hriaznov <[email protected]>
* feat: add support for BLOCK9_450, BLOCK286 and LEGACY satributes

* chore: update legacy description text

* chore: update block286 description text

Co-authored-by: Victor Kirov <[email protected]>

* chore: bump xverse-core to 13.1.0

---------

Co-authored-by: Victor Kirov <[email protected]>
Co-authored-by: Tim Man <[email protected]>
* fix: add mixpanel types and fix type errors

also use the global mixpanel object's instances

* Update src/app/mixpanelSetup.ts

Co-authored-by: Den <[email protected]>

* Update src/app/mixpanelSetup.ts

Co-authored-by: Den <[email protected]>

---------

Co-authored-by: Den <[email protected]>
Update ESLint to Version 8.40.0 and add ESLint Plugin Playwright
Adjust Screensize to 360x360 for CI
Add visual check for legal page
Add visual check error messages for password pages
Skip Backup flow
Setup backup and successfully creating a wallet
* chore: add a script for merging public to private

chore: update merge scripts

chore: update scripts with correct remote url

chore: fix gh cli check in scirpts

chore: fix scripts with pr command

chore: fix new lines

chore: fix attempt for the release pr action error: fatal unrelated histories

chore: add workflow to trigger the script

chore: remove trigger on pr

chore: rename workflow and add choice of direction

chore: update script with --unshallow

chore: remove --unshallow

chore: simplify merge script

chore: delete other script in favour of one way merges

chore: continue script if bad tags

chore: assign reviewers to the merge

chore: fix assign reviewer part

chore: oops remove merge markers

chore: loop for main and develop

chore: add script use to workflows

chore: remove unshallow for --allow-unrelated-histories

chore: remove comment

* chore: use a generic name for merge script

* chore: add CODEOWNERS file

* chore: fix asset upload and add steps to copy release to public
fedeerbes and others added 23 commits April 17, 2024 15:53
…ount component (#203)

* fix: missing divisibility in runes psbt amount and layout in runes amount component

* fix: amount aligment and amount overflow
Delete workaround (double click) for the refresh page issue
[ENG-4132]Add data-testid to network address input fields
…let-reload-page-instead-of-showing-error-message

[ENG-4028] fix: Restore wallet: reload page instead of showing error message
* Don't show rune burn label on partial transaction

* chore: add runes delegation section

* fix: minor animation and icon fixes

---------

Co-authored-by: fede erbes <[email protected]>
Co-authored-by: Tim Man <[email protected]>
* Add rune recovery flow

* Fix minor bug and add logo

* Clean up and make fee rate configurable

* Fix runes receipt display

* chore: add review tx before confirming recover runes (#216)

* chore: add review tx before confirming recover runes

* chore: update description text

* address comments

* touchup based on new requirements

* chore: move away from restore and use recover

* fix ordering and invert state variable

* chore: move away from restore and use recover

* remove unnecessary function

* fix error message not mapped properly and touchup

* fix: wrong tab selection in recover assets flow

---------

Co-authored-by: Terence Ng <[email protected]>

---------

Co-authored-by: fede erbes <[email protected]>
Co-authored-by: Terence Ng <[email protected]>
* Show cenotaph warning

* Move cenotaph warning to transactionSummary
* [ENG-4133] Add "switch to testnet and back to mainnet" flow and functions

[ENG-4132]Add data-testid to network address input fields

* [ENG-4081] Add locators

* Add account check

* [ENG-4080] Account management

* [ENG-4079] Add token locators

* add check token page

* Rename startpage to wallet

* Add enable and disable token flow

* Add balance check and BRC-20 FLOW

Enable and disable all tokens SIP-10 AND BRC-20
Add one more shard for UI test execution for RC build

* Add { exact: true } to get exact match (case-sensitive and whole-string) for tokenName (example ORDI)

* Add workflow trigger for UI tests suite being exeuted for uitest branches for PRs
* fix crash issue

* use isInitialLoading
- Add locators for explore tab
- Adjust build workflow to be executed with e2etest branches
-  Update playwright
- Change ubuntu-latest to ubuntu-20.04 in the workflow files
@teebszet teebszet requested a review from dhriaznov April 25, 2024 10:15
Copy link

@teebszet teebszet merged commit b1da034 into develop Apr 25, 2024
10 checks passed
@teebszet teebszet deleted the chore/merge-develop-to-public-1714040021 branch April 25, 2024 10:19
@teebszet teebszet restored the chore/merge-develop-to-public-1714040021 branch May 31, 2024 10:32
@teebszet teebszet deleted the chore/merge-develop-to-public-1714040021 branch May 31, 2024 10:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants