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

chore: merge private to public #803

Merged
merged 27 commits into from
Feb 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
b10c686
[ENG-3450] feat: Make the Explore tab in the extension
dhriaznov Feb 12, 2024
df26af7
Add the Expand view link on the /explore screen
dhriaznov Feb 13, 2024
3dd4ec1
Use theme space object instead of hardcoded values
dhriaznov Feb 13, 2024
46b9fd6
Update the featured app fetching logic
dhriaznov Feb 14, 2024
61e5a0e
Update xverse-core
jordankzf Feb 15, 2024
d855e87
Remove mocks
jordankzf Feb 15, 2024
0ab95c6
Update FeaturedCards to use new FeaturedDapp type
jordankzf Feb 15, 2024
e99391d
Update RecommendedApps to use new FeaturedDapp type
jordankzf Feb 15, 2024
cb18fe1
Remove unused mocked assets
jordankzf Feb 15, 2024
8cb05e7
fix (#77)
Feb 16, 2024
2451f56
Merge branch 'develop' into chore-merge-public-to-private-develop
teebszet Feb 16, 2024
afbc2f0
Merge pull request #78 from secretkeylabs/chore-merge-public-to-priva…
teebszet Feb 16, 2024
235102b
Merge branch 'develop' of https://github.com/secretkeylabs/xverse-web…
jordankzf Feb 19, 2024
c62ec4b
Add the useFeaturedApps hook
dhriaznov Feb 19, 2024
ea60aec
Update the query key logic in the useFeaturedDapps hook
dhriaznov Feb 19, 2024
6125868
Update SwiperNavigation
jordankzf Feb 19, 2024
b6c2919
Truncate RecommendedApps description text
jordankzf Feb 19, 2024
32dd91c
Make Subheader uppercase
jordankzf Feb 20, 2024
a77bda2
Allow 'self' and 'data:' for font-src
jordankzf Feb 20, 2024
9b83e09
[ENG-3583] feat: Update the auto lock timer screen UI (#74)
dhriaznov Feb 21, 2024
1bda9ef
Max 2 lines description
jordankzf Feb 21, 2024
d0d3eb0
Lock swiper version
jordankzf Feb 21, 2024
fcb6d86
Styling changes
jordankzf Feb 21, 2024
4ab7bac
Merge pull request #73 from secretkeylabs/denys/eng-3450-make-the-exp…
DuskaT021 Feb 21, 2024
ff70609
[ENG-3437] fix: Fix the Receive address copy popup checkbox (#76)
dhriaznov Feb 21, 2024
cd95da6
Update onboarding screens + add landing animations (#72)
Feb 22, 2024
6a16d6a
Merge remote-tracking branch 'origin/develop' into chore/merge-privat…
teebszet Feb 26, 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
135 changes: 128 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"@phosphor-icons/react": "^2.0.10",
"@react-spring/web": "^9.6.1",
"@scure/btc-signer": "1.2.1",
"@secretkeylabs/xverse-core": "11.0.0",
"@secretkeylabs/xverse-core": "11.1.0",
"@stacks/connect": "7.4.1",
"@stacks/stacks-blockchain-api-types": "6.1.1",
"@stacks/transactions": "6.9.0",
Expand Down Expand Up @@ -50,6 +50,7 @@
"react-hot-toast": "^2.4.0",
"react-i18next": "^11.18.6",
"react-is-visible": "^1.2.0",
"react-lottie": "^1.2.4",
"react-modal": "^3.15.1",
"react-number-format": "^5.0.0",
"react-qr-code": "^2.0.8",
Expand All @@ -67,6 +68,7 @@
"stream-browserify": "^3.0.0",
"string-to-color": "^2.2.2",
"styled-components": "^5.3.5",
"swiper": "11.0.6",
"valid-url": "^1.0.9",
"webextension-polyfill": "^0.10.0",
"zxcvbn": "^4.4.2"
Expand Down Expand Up @@ -99,6 +101,7 @@
"@types/chrome": "^0.0.237",
"@types/react": "^18.0.20",
"@types/react-dom": "^18.0.6",
"@types/react-lottie": "^1.2.10",
"@types/react-modal": "^3.13.1",
"@types/redux-state-sync": "^3.1.5",
"@types/styled-components": "^5.1.26",
Expand Down
10 changes: 10 additions & 0 deletions src/app/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,16 @@ function App(): JSX.Element {
color: Theme.colors.white_0,
},
},
blank: {
style: {
...Theme.typography.body_medium_m,
backgroundColor: Theme.colors.white_0,
borderRadius: Theme.radius(2),
padding: Theme.space.s,
color: Theme.colors.elevation0,
},
duration: 2000,
},
}}
/>
</ThemeProvider>
Expand Down
Loading
Loading