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.

Sign up for GitHub

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

Jump to bottom

merge-main-to-public #830

Merged
merged 197 commits into from
Jul 9, 2024
Merged

merge-main-to-public #830

merged 197 commits into from
Jul 9, 2024

Conversation

dhriaznov
Copy link
Contributor

Created by merge-to-remote.sh

aryzing and others added 30 commits May 28, 2024 13:40
@aryzing
Use key to force re-render
2984dbe
@aryzing
Merge pull request #300 from secretkeylabs/eduard/eng-4264-confirm-pa…
5f3fdd1 
…ssword-should-focus-input

Eduard/eng 4264 confirm password should focus input
@dhriaznov
Merge pull request #297 from secretkeylabs/release/v0.36.1
1d626ac 
release: v0.36.1 to develop
@teebszet
chore: use the right scripts paths in release.yml (#298)
e62707c
@dhriaznov
[ENG-4354] Change the header UI for the Swap confirmation screen (#285)
c6da745
@fedeerbes
chore: add ability to create releases of other branches in addition t…
4f82430 
…o the develop branch (#302)
@victorkirov @teebszet
Bail if redux-persist fails to load state from storage
6fae048
@victorkirov @teebszet
Add comment
4af3b44
@victorkirov @teebszet
Only fallback to onboarding if there is no seed phrase
1c8d7cd
@fedeerbes @teebszet
chore: add ability to create releases of other branches in addition t…
01bd6cc 
…o the develop branch (#302)
release: v0.36.2
a2c609e
Merge remote-tracking branch 'origin/main' into release/v0.36.2
fcff9cf
@teebszet
chore: use the right scripts paths in release.yml (#298)
0ae1a53
@victorkirov @teebszet
Use global error screen
357ebde
@victorkirov @teebszet
Remove unused vars
5ebed07
@victorkirov @teebszet
Fix no account if chrome storage error occurs on wallet create
32edeba
@victorkirov @teebszet
Remove fallback timeout for persist store
76e6efe
@Christine-Pinto @teebszet
Add clickOnSpecificToken function
5543023
@dhriaznov
Merge pull request #306 from secretkeylabs/release/v0.36.2
6d4e506
@dhriaznov
Merge pull request #307 from secretkeylabs/release/v0.36.2
e2f5e32
@Christine-Pinto
Add clickOnSpecificToken function (#310)
fb5f9ff
@dhriaznov
[ENG-4267] Make a couple of UI/UX tweaks on the onboarding (#265)
60aae48 
* [ENG-4267] Make a couple of UI/UX tweaks on the onboarding

* Memoize the Steps component keys

* Update the Steps component logic and name to Dots
@dhriaznov
[ENG-4249] Add Swap button to STX details page in web extension (#276)
0db6ace 
* [ENG-4249] Add Swap button to STX details page in web extension

* Remove the `ButtonContainer`

* Change the `from` param handling for the swap screen

* fix the swap bug
@victorkirov @dhriaznov
If user hasn't finished onbaording, make auth guard send to landing
936b60d
@victorkirov @dhriaznov
Show loader until seed phrase is bootstrapped on backup wallet page
4cd83b0
release: v0.36.3
8ca6f6a
Merge remote-tracking branch 'origin/main' into release/v0.36.3
795d985
@m-aboelenein @dhriaznov
re-initialize storage after password confirmation
e911d5d
@victorkirov @dhriaznov
Do clearVaultStorage instead of storage.local.clear
8a2ec1b
@dhriaznov
Merge pull request #317 from secretkeylabs/vic/update-seed-backup
e35adfd 
Vic/update seed backup
m-aboelenein and others added 23 commits July 3, 2024 13:48
@m-aboelenein
fix file name
57df228
@aryzing
Use core getBalance
8c8f522
@aryzing
Make resource ids unique across soft/hardware wallets
fdf086c
@aryzing
Update sats-connect/core version
246a267
@aryzing
Update dependency array
1e0fe8a
@aryzing
Merge branch 'develop' into eduard/eng-4528
c610b25
@m-aboelenein
Merge branch 'eduard/eng-4528' into mahmoud/eng-4370-ord_getinscriptions
300d73c
@m-aboelenein
fix duplicate key
a86fd94
@m-aboelenein
update getInscriptions response
9c97154
@aryzing
Add permissions store and update a few methods
1e90756
@aryzing
Merge branch 'develop' into mahmoud/eng-4370-ord_getinscriptions
05abc3a
@jordankzf
Merge pull request #378 from secretkeylabs/jordankzf/explore-tabs
61d0c34 
Tabs for Explore (Featured Apps)
@aryzing
Place actions buttons at bottom (#381)
6723714
@m-aboelenein
fix ledger mint and etch
baf3a60
@m-aboelenein
Merge pull request #368 from secretkeylabs/mahmoud/eng-4370-ord_getin…
aa586d8 
…scriptions

ord_getInscriptions request support
@m-aboelenein
Merge pull request #382 from secretkeylabs/follow-up/mahmoud/eng-4240-…
f03e219 
…runes-api-mint-5-runes_mint-pops-a-dedicated-runes-mint-tx

follow-up/mahmoud/eng-4240-runes-api-mint-5-runes_mint-pops-a-dedicated-runes-mint-tx
@dhriaznov
Merge pull request #372 from secretkeylabs/release/v0.38.0
423ee65 
release: v0.38.0 to main
@aryzing
Downgrade to lockfile v2 (#386)
92044a8
@dhriaznov
Merge pull request #373 from secretkeylabs/release/v0.38.0
841ad4a 
release: v0.38.0 to develop
release: v0.38.1
c6a340d
Merge remote-tracking branch 'origin/main' into release/v0.38.1
6a0d3df
@terencehh
fix bug (#387)
efc0a34
@teebszet
Merge pull request #388 from secretkeylabs/release/v0.38.1
b7a6f9b 
release: v0.38.1 to main
@dhriaznov dhriaznov requested a review from a team as a code owner July 9, 2024 08:29
@dhriaznov dhriaznov requested review from aryzing and teebszet and removed request for a team and aryzing July 9, 2024 08:29
@teebszet teebszet merged commit 5737552 into main Jul 9, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@teebszet teebszet teebszet approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@dhriaznov @teebszet @aryzing @fedeerbes @victorkirov @Christine-Pinto @m-aboelenein @jordankzf @terencehh @abdulhaseeb4239