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-main-to-public #830

Merged
merged 197 commits into from
Jul 9, 2024
Merged
Changes from 1 commit
Commits
Show all changes
197 commits
Select commit Hold shift + click to select a range
2984dbe
Use key to force re-render
aryzing May 28, 2024
5f3fdd1
Merge pull request #300 from secretkeylabs/eduard/eng-4264-confirm-pa…
aryzing May 28, 2024
1d626ac
Merge pull request #297 from secretkeylabs/release/v0.36.1
dhriaznov May 28, 2024
e62707c
chore: use the right scripts paths in release.yml (#298)
teebszet May 29, 2024
c6da745
[ENG-4354] Change the header UI for the Swap confirmation screen (#285)
dhriaznov May 29, 2024
4f82430
chore: add ability to create releases of other branches in addition t…
fedeerbes May 30, 2024
6fae048
Bail if redux-persist fails to load state from storage
victorkirov May 29, 2024
4af3b44
Add comment
victorkirov May 29, 2024
1c8d7cd
Only fallback to onboarding if there is no seed phrase
victorkirov May 29, 2024
01bd6cc
chore: add ability to create releases of other branches in addition t…
fedeerbes May 30, 2024
a2c609e
release: v0.36.2
May 31, 2024
fcff9cf
Merge remote-tracking branch 'origin/main' into release/v0.36.2
May 31, 2024
0ae1a53
chore: use the right scripts paths in release.yml (#298)
teebszet May 29, 2024
357ebde
Use global error screen
victorkirov May 30, 2024
5ebed07
Remove unused vars
victorkirov May 30, 2024
32edeba
Fix no account if chrome storage error occurs on wallet create
victorkirov May 30, 2024
76e6efe
Remove fallback timeout for persist store
victorkirov May 31, 2024
5543023
Add clickOnSpecificToken function
Christine-Pinto May 31, 2024
6d4e506
Merge pull request #306 from secretkeylabs/release/v0.36.2
dhriaznov Jun 1, 2024
e2f5e32
Merge pull request #307 from secretkeylabs/release/v0.36.2
dhriaznov Jun 1, 2024
fb5f9ff
Add clickOnSpecificToken function (#310)
Christine-Pinto Jun 3, 2024
60aae48
[ENG-4267] Make a couple of UI/UX tweaks on the onboarding (#265)
dhriaznov Jun 3, 2024
0db6ace
[ENG-4249] Add Swap button to STX details page in web extension (#276)
dhriaznov Jun 3, 2024
936b60d
If user hasn't finished onbaording, make auth guard send to landing
victorkirov Jun 3, 2024
4cd83b0
Show loader until seed phrase is bootstrapped on backup wallet page
victorkirov Jun 3, 2024
8ca6f6a
release: v0.36.3
Jun 3, 2024
795d985
Merge remote-tracking branch 'origin/main' into release/v0.36.3
Jun 3, 2024
e911d5d
re-initialize storage after password confirmation
m-aboelenein Jun 3, 2024
8a2ec1b
Do clearVaultStorage instead of storage.local.clear
victorkirov Jun 4, 2024
e35adfd
Merge pull request #317 from secretkeylabs/vic/update-seed-backup
dhriaznov Jun 4, 2024
cf58d16
fix sanity check (#311)
m-aboelenein Jun 4, 2024
e8c6777
switch Wallet for fund check (#318)
Christine-Pinto Jun 4, 2024
56e8a8f
Clear local and session storage on onboard (#319)
dhriaznov Jun 4, 2024
8405d2a
Merge pull request #315 from secretkeylabs/release/v0.36.3
dhriaznov Jun 4, 2024
2cc7cc1
Merge pull request #316 from secretkeylabs/release/v0.36.3
dhriaznov Jun 4, 2024
3cd37d4
Apply some playwright enhancements (and solves ENG-3992) (#312)
victorkirov Jun 5, 2024
f9763e5
[ENG-4289] Add the AUD fiat currency option (#261)
dhriaznov Jun 5, 2024
1e61040
[ENG-4429] Hide the Runes Recovery button for Ledger accounts (#321)
dhriaznov Jun 5, 2024
5b90aec
[FIX] Currency change Test (#323)
Christine-Pinto Jun 6, 2024
53cf553
fix: close the popup window if user needs to onboard (#324)
teebszet Jun 6, 2024
d854f6a
Bail if redux-persist fails to load state from storage - ENG-4414 (#301)
victorkirov Jun 6, 2024
43ec91c
Switch to consolidated txn logic for inscription mint and brc-20 1 st…
victorkirov Jun 6, 2024
bdb9496
Add Signet Support (#288)
victorkirov Jun 6, 2024
7787bf7
[ENG-4430] Use feature flags from API to disable swaps on web-extensi…
dhriaznov Jun 6, 2024
ddac532
Bump Core to fix disappearing new accounts - ENG-4170 (#325)
victorkirov Jun 7, 2024
9a623f4
reset account balances on network and currency change - ENG-4351 (#327)
victorkirov Jun 7, 2024
2b4c5e7
[Fix] Swap button check (#328)
Christine-Pinto Jun 7, 2024
fa5b9f0
release: v0.37.0
Jun 7, 2024
019379b
Merge remote-tracking branch 'origin/main' into release/v0.37.0
Jun 7, 2024
b67bd90
Bump core to 14.2
victorkirov Jun 7, 2024
607cfa6
Merge pull request #331 from secretkeylabs/vic/core-14.2
victorkirov Jun 7, 2024
383ebb0
[Fix] Skip builds on draft PRs (#333)
Christine-Pinto Jun 10, 2024
286a861
Remove unused import (#335)
aryzing Jun 10, 2024
8ff143f
chore: bump core with brc20 fix
teebszet Jun 11, 2024
462e366
fix: minor copy in error message
teebszet Jun 12, 2024
287b407
Merge pull request #329 from secretkeylabs/release/v0.37.0
teebszet Jun 12, 2024
597b949
Merge pull request #330 from secretkeylabs/release/v0.37.0
teebszet Jun 12, 2024
fc5a708
Feat/seed vault v2 - Data Migration Flow (#322)
m-aboelenein Jun 12, 2024
c1f5132
release: v0.37.1
Jun 12, 2024
5cf9c18
Merge remote-tracking branch 'origin/main' into release/v0.37.1
Jun 12, 2024
64e40df
update core version
m-aboelenein Jun 12, 2024
6c4f9a9
Merge pull request #340 from secretkeylabs/mahmoud/eng-4495-migration…
m-aboelenein Jun 12, 2024
234b5fb
[ENG-4262] Add collectibles basic E2E tests (#326)
Christine-Pinto Jun 13, 2024
abd5ff8
make sure the accounts data is cached after completing the migration
m-aboelenein Jun 13, 2024
45c9a63
Update the copy on the Ledger account import flow to include Runes (#…
dhriaznov Jun 13, 2024
fe764b2
submit skip event before navigating to the home screen
m-aboelenein Jun 13, 2024
6b46acd
Merge pull request #339 from secretkeylabs/tim/fix-grammar-in-error-m…
jordankzf Jun 14, 2024
d5dc52b
update comment
m-aboelenein Jun 14, 2024
8524b9f
Merge pull request #341 from secretkeylabs/mahmoud/eng-4506-closes-th…
m-aboelenein Jun 14, 2024
d9d3bc8
Merge pull request #337 from secretkeylabs/release/v0.37.1
teebszet Jun 17, 2024
bf8b047
Merge pull request #338 from secretkeylabs/release/v0.37.1
teebszet Jun 17, 2024
0916edc
use principal (mainly to fix sip-10) (#347)
terencehh Jun 19, 2024
c0d7477
Refactor redux store in how we store and access accounts - ENG-4427 E…
victorkirov Jun 19, 2024
f625ab6
release: v0.37.2
Jun 19, 2024
7b98b9b
Merge remote-tracking branch 'origin/main' into release/v0.37.2
Jun 19, 2024
46faf48
[ENG-4466] Jordankzf/remove rare sats warning (#353)
teebszet Jun 20, 2024
f3e13a3
Merge remote-tracking branch 'origin/develop' into release/v0.37.2
teebszet Jun 20, 2024
1e7671b
PayPal logo
jordankzf Jun 20, 2024
d900b9f
Paypal copy and geo restriction label
jordankzf Jun 20, 2024
720c574
SubText support for redirectButton
jordankzf Jun 20, 2024
9233554
PayPal on-ramp option
jordankzf Jun 20, 2024
abff3ef
infer protocol from list instead of ft.principle (#348)
terencehh Jun 20, 2024
03b4ad9
Remove nonsense useEffect
jordankzf Jun 20, 2024
7b2a88b
Merge pull request #355 from secretkeylabs/jordankzf/paypal-on-ramp
jordankzf Jun 20, 2024
7f71d89
refactor: use rune id to fetch fiat rates (#336)
teebszet Jun 20, 2024
8258826
[Fix] Execution for E2E Tests to run in Shards (#356)
Christine-Pinto Jun 20, 2024
f282321
Fix some undefined variables issues (#357)
victorkirov Jun 21, 2024
bedc62c
Detect aliases automatically in Vite config
aryzing Jun 21, 2024
63039e4
WIP
aryzing Jun 19, 2024
7b0a192
Fix dep version
aryzing Jun 20, 2024
d385d94
Disable eslint rules
aryzing Jun 20, 2024
5a85bae
Add imports
aryzing Jun 20, 2024
68ca294
Add PermissionsProvider to App
aryzing Jun 20, 2024
89fe5eb
Add openPopup utilities
aryzing Jun 20, 2024
d872b52
Remove unused var
aryzing Jun 20, 2024
b124d8f
WIP
aryzing Jun 21, 2024
d60f916
WIP
aryzing Jun 21, 2024
89b87ce
WIP
aryzing Jun 21, 2024
e0d6666
WIP
aryzing Jun 22, 2024
3e70c02
WIP
aryzing Jun 22, 2024
28c1d25
Change setup to use the master pubkey hash as the identifier (#359)
victorkirov Jun 24, 2024
f15ba0f
WIP
aryzing Jun 24, 2024
9ad0f61
Merge pull request #349 from secretkeylabs/release/v0.37.2
dhriaznov Jun 24, 2024
ab1b82b
Merge pull request #350 from secretkeylabs/release/v0.37.2
dhriaznov Jun 24, 2024
4d6aae3
[ENG-4536] fix: Font color for the fiat value for the fee should be w…
dhriaznov Jun 24, 2024
3f3b40f
WIP
aryzing Jun 24, 2024
d65a5d2
Stabilize store reactivity
aryzing Jun 24, 2024
7ef2f9b
Remove unused comment
aryzing Jun 24, 2024
c83bce7
Use removeClient
aryzing Jun 24, 2024
7bebfc3
touchup (#362)
terencehh Jun 25, 2024
baab554
WIP
aryzing Jun 25, 2024
5a5baa4
Support getBalance and update perms check
aryzing Jun 25, 2024
d551cd0
Update docs
aryzing Jun 25, 2024
82cc2dd
Remove unused import
aryzing Jun 25, 2024
78cc695
Update core and fix unconfirmed check (#299)
victorkirov Jun 26, 2024
2428938
Add support for non-address outputs on the confirmation screen ENG-45…
victorkirov Jun 26, 2024
5cb7ebf
update height (#365)
terencehh Jun 26, 2024
6f78105
Remove unused import
aryzing Jun 26, 2024
c58464e
Update result value
aryzing Jun 26, 2024
7e9e6c0
Update handler types
aryzing Jun 26, 2024
cd03e1d
Update method name
aryzing Jun 26, 2024
6b1ee1b
Fix message
aryzing Jun 26, 2024
e31cce5
Set permissions on getRunesBalance
aryzing Jun 26, 2024
5ca4dab
Rename method
aryzing Jun 26, 2024
5682850
Handle disconnect
aryzing Jun 26, 2024
9d98d84
Use strings
aryzing Jun 26, 2024
9cf6d94
WIP
aryzing Jun 26, 2024
0c2351e
Log unexpected execution branches
aryzing Jun 26, 2024
593e72e
Sort assets by descending $-value in the account dashboard (#363)
terencehh Jun 27, 2024
f3e31d4
Update method names
aryzing Jun 27, 2024
bd423d2
Sort resources
aryzing Jun 27, 2024
75d778b
Update core version
aryzing Jun 27, 2024
279b047
Update blance calculations
aryzing Jun 27, 2024
388f639
push fix (#367)
terencehh Jun 28, 2024
4c81b47
ord_getInscriptions request support
m-aboelenein Jun 28, 2024
a515686
Disable permissions settings in prod
aryzing Jun 28, 2024
67d957f
[ENG-4272] Runes listing/unlisting flow (#332)
dhriaznov Jun 28, 2024
d481ee0
fix: use principal to identify brc20 or rune FT to send (#370)
teebszet Jun 28, 2024
7b189fb
Update connection request screen
aryzing Jun 28, 2024
563ee0b
push fix (#371)
terencehh Jul 1, 2024
2b61a89
feat: send max STX, confirm STX (#220)
abdulhaseeb4239 Jul 1, 2024
5628bd0
Update sats-connect-core version
aryzing Jul 1, 2024
2465abd
[ENG-4070] Fix custom account names are forgotten by the web extensio…
dhriaznov Jul 1, 2024
22d56ad
Update sats-connect core
aryzing Jul 1, 2024
083be39
Update sats-connect core
aryzing Jul 1, 2024
c5a6da2
Merge branch 'develop' into eduard/eng-4528
aryzing Jul 1, 2024
d561bf0
ENG-4570: PayPal feature flag (#369)
jordankzf Jul 1, 2024
93be9cc
Mahmoud/eng 4240 runes api - mint runes pops a dedicated runes mint t…
m-aboelenein Jul 1, 2024
3c845d4
release: v0.38.0
Jul 1, 2024
a0453dc
Merge remote-tracking branch 'origin/main' into release/v0.38.0
Jul 1, 2024
830c9b8
Fix e2e tests
aryzing Jul 1, 2024
bbc041b
fix: send sip10 screen to use principal as identifier (#374)
teebszet Jul 2, 2024
04b24ad
Merge branch 'develop' into release/v0.38.0
teebszet Jul 2, 2024
56deb54
Rename files
aryzing Jul 2, 2024
ecaf72c
Remove unused code
aryzing Jul 2, 2024
882999d
Fix disappearing custom acc names (#376)
dhriaznov Jul 2, 2024
9ab2d2c
Add port causing error
aryzing Jul 2, 2024
347acfa
Remove unused code
aryzing Jul 2, 2024
4d48b06
Add port to error cause
aryzing Jul 2, 2024
534b05e
Move hasPermissions to helpers
aryzing Jul 2, 2024
2c017e8
Use bitcoin getAddresses for bitcoin
aryzing Jul 2, 2024
7ed2e69
Format code
aryzing Jul 2, 2024
aae1563
Fix nonce issue for sip-10 txs (#377)
dhriaznov Jul 2, 2024
4f404e3
Use builder for resources
aryzing Jul 2, 2024
996d9b7
Rename file
aryzing Jul 2, 2024
d2bf282
Create enum for route paths
aryzing Jul 2, 2024
70c9407
Reusable Tabs component
jordankzf Jul 2, 2024
46bad3c
Remove optional chaining
aryzing Jul 2, 2024
c1d0f84
Category tabs for Featured Apps
jordankzf Jul 2, 2024
74368fa
Margin adjustment
jordankzf Jul 2, 2024
2f3870f
Use storage class
aryzing Jul 2, 2024
6683a98
Make some small UI fixes (#379)
dhriaznov Jul 3, 2024
83b435a
Bump xverse-core
jordankzf Jul 3, 2024
81fa7ca
Remove unnecessary typing
jordankzf Jul 3, 2024
57df228
fix file name
m-aboelenein Jul 3, 2024
8c8f522
Use core getBalance
aryzing Jul 3, 2024
fdf086c
Make resource ids unique across soft/hardware wallets
aryzing Jul 3, 2024
246a267
Update sats-connect/core version
aryzing Jul 3, 2024
1e0fe8a
Update dependency array
aryzing Jul 3, 2024
c610b25
Merge branch 'develop' into eduard/eng-4528
aryzing Jul 3, 2024
300d73c
Merge branch 'eduard/eng-4528' into mahmoud/eng-4370-ord_getinscriptions
m-aboelenein Jul 3, 2024
a86fd94
fix duplicate key
m-aboelenein Jul 3, 2024
9c97154
update getInscriptions response
m-aboelenein Jul 3, 2024
1e90756
Add permissions store and update a few methods
aryzing Jul 3, 2024
05abc3a
Merge branch 'develop' into mahmoud/eng-4370-ord_getinscriptions
aryzing Jul 3, 2024
61d0c34
Merge pull request #378 from secretkeylabs/jordankzf/explore-tabs
jordankzf Jul 4, 2024
6723714
Place actions buttons at bottom (#381)
aryzing Jul 4, 2024
baf3a60
fix ledger mint and etch
m-aboelenein Jul 4, 2024
aa586d8
Merge pull request #368 from secretkeylabs/mahmoud/eng-4370-ord_getin…
m-aboelenein Jul 4, 2024
f03e219
Merge pull request #382 from secretkeylabs/follow-up/mahmoud/eng-4240…
m-aboelenein Jul 4, 2024
423ee65
Merge pull request #372 from secretkeylabs/release/v0.38.0
dhriaznov Jul 4, 2024
92044a8
Downgrade to lockfile v2 (#386)
aryzing Jul 4, 2024
841ad4a
Merge pull request #373 from secretkeylabs/release/v0.38.0
dhriaznov Jul 4, 2024
c6a340d
release: v0.38.1
Jul 4, 2024
6a0d3df
Merge remote-tracking branch 'origin/main' into release/v0.38.1
Jul 4, 2024
efc0a34
fix bug (#387)
terencehh Jul 4, 2024
b7a6f9b
Merge pull request #388 from secretkeylabs/release/v0.38.1
teebszet Jul 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Show loader until seed phrase is bootstrapped on backup wallet page
  • Loading branch information
victorkirov authored and dhriaznov committed Jun 3, 2024
commit 4cd83b06af802bfa9a06bc1baaf750d3801cafc3
53 changes: 40 additions & 13 deletions src/app/screens/backupWallet/index.tsx
Original file line number Diff line number Diff line change
@@ -2,7 +2,8 @@ import backup from '@assets/img/backupWallet/backup.svg';
import useSeedVault from '@hooks/useSeedVault';
import { generateMnemonic } from '@secretkeylabs/xverse-core';
import Button from '@ui-library/button';
import { useEffect } from 'react';
import Spinner from '@ui-library/spinner';
import { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
import styled from 'styled-components';
@@ -50,6 +51,14 @@ const BackupActionsContainer = styled.div((props) => ({
columnGap: props.theme.space.xs,
}));

const LoadingContainer = styled.div((props) => ({
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
marginTop: props.theme.spacing(20),
width: '100%',
}));

function BackupWallet(): JSX.Element {
const { t } = useTranslation('translation', { keyPrefix: 'BACKUP_WALLET_SCREEN' });
const navigate = useNavigate();
@@ -60,6 +69,7 @@ function BackupWallet(): JSX.Element {
hasSeed,
clearVaultStorage,
} = useSeedVault();
const [isLoading, setIsLoading] = useState(false);

// TODO move this to SeedVault?
const generateAndStoreSeedPhrase = async () => {
@@ -70,15 +80,20 @@ function BackupWallet(): JSX.Element {

useEffect(() => {
(async () => {
setIsLoading(true);
const hasSeedPhrase = await hasSeed();
if (!hasSeedPhrase) {
await generateAndStoreSeedPhrase();
} else {
// attempt to unlock the wallet with an empty password (verifies the user didn't finish onboarding)
await unlockVault('');
// clear the vault storage and generate a new seed phrase
await clearVaultStorage();
await generateAndStoreSeedPhrase();
try {
if (!hasSeedPhrase) {
await generateAndStoreSeedPhrase();
} else {
// attempt to unlock the wallet with an empty password (verifies the user didn't finish onboarding)
await unlockVault('');
// clear the vault storage and generate a new seed phrase
await clearVaultStorage();
await generateAndStoreSeedPhrase();
}
} finally {
setIsLoading(false);
}
})();
}, []);
@@ -99,10 +114,22 @@ function BackupWallet(): JSX.Element {
<ContentContainer>
<Title>{t('SCREEN_TITLE')}</Title>
<SubTitle>{t('SCREEN_SUBTITLE')}</SubTitle>
<BackupActionsContainer>
<Button onClick={handleSkip} variant="secondary" title={t('BACKUP_SKIP_BUTTON')} />
<Button onClick={handleBackup} title={t('BACKUP_BUTTON')} />
</BackupActionsContainer>
{isLoading && (
<LoadingContainer>
<Spinner size={50} />
</LoadingContainer>
)}
{!isLoading && (
<BackupActionsContainer>
<Button
onClick={handleSkip}
variant="secondary"
title={t('BACKUP_SKIP_BUTTON')}
disabled={isLoading}
/>
<Button onClick={handleBackup} title={t('BACKUP_BUTTON')} disabled={isLoading} />
</BackupActionsContainer>
)}
</ContentContainer>
</Container>
);