Skip to content

Commit

Permalink
Merge pull request #65 from SimpleHold/1.26.6
Browse files Browse the repository at this point in the history
1.26.6
  • Loading branch information
Dylan-Simplehold authored Jan 26, 2023
2 parents 7e50746 + 0a78601 commit 4743aa3
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "extension",
"version": "1.26.3",
"version": "1.26.6",
"description": "extension",
"private": false,
"repository": "https://github.com/SimpleHold/extension.git",
Expand Down
5 changes: 4 additions & 1 deletion src/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"manifest_version": 3,
"name": "SimpleHold",
"version": "1.26.3",
"version": "1.26.6",
"icons": {
"16": "favicon-16.png",
"32": "favicon-32.png",
Expand Down Expand Up @@ -30,6 +30,9 @@
"default_popup": "popup.html",
"default_title": "SimpleHold"
},
"background": {
"service_worker": "background.js"
},
"content_scripts": [
{
"matches": [
Expand Down
2 changes: 1 addition & 1 deletion src/pages/ImportPrivateKey/ImportPrivateKey.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ const ImportPrivateKey: React.FC = () => {

const getCurrenciesList = (getCurrencyInfo?: TCurrency | undefined | null): string[] => {
if (getCurrencyInfo) {
return getList(getCurrencyInfo.symbol, chain)
return getList(symbol, chain)
}

return [symbol]
Expand Down
3 changes: 1 addition & 2 deletions src/pages/NewWallet/NewWallet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,9 @@ const NewWallet: React.FC = () => {
decimals,
})
}

const getCurrenciesList = (getCurrencyInfo?: TCurrency | undefined | null): string[] => {
if (getCurrencyInfo) {
return getList(getCurrencyInfo.symbol, chain)
return getList(symbol, chain)
}

return [symbol]
Expand Down
4 changes: 2 additions & 2 deletions src/pages/WelcomeNew/WelcomeNew.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ const WelcomeNew: React.FC = () => {
isAbsolute
/>
<Styles.Container className="container">
<Styles.Row>
<Styles.Illustrate src={themes[theme][0].image} alt="illustrate" />
<Styles.Row theme={theme}>
<Styles.Illustrate src={themes[theme][0].image} theme={theme} alt="illustrate" />
<Styles.Title className="title">{themes[theme][0].title}</Styles.Title>
<Styles.Description className="description">
{themes[theme][0].description}
Expand Down
10 changes: 6 additions & 4 deletions src/pages/WelcomeNew/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ const Wrapper = styled.div`
}
.container {
padding: ${({ theme }: TThemeProps) =>
theme === 'swapspace' ? '240px 30px 0 30px' : '20px 30px 0 30px'};
padding: 20px 30px 0 30px;
}
.slide {
Expand All @@ -83,11 +82,14 @@ const Row = styled.div`
display: flex;
flex-direction: column;
align-items: center;
margin-top: ${({ theme }: TThemeProps) => (theme === 'swapspace' ? '200px' : '0')};
`

const Illustrate = styled.img`
width: 230px;
height: 200px;
width: ${({ theme }: TThemeProps) => (theme === 'swapspace' ? '375px' : '230px')};
height: ${({ theme }: TThemeProps) => (theme === 'swapspace' ? '315px' : '200px')};
position: ${({ theme }: TThemeProps) => (theme === 'swapspace' ? 'absolute' : 'relative')};
top: ${({ theme }: TThemeProps) => (theme === 'swapspace' ? '0' : 'initial')};
`

const Title = styled.p`
Expand Down

0 comments on commit 4743aa3

Please sign in to comment.