Skip to content

Commit

Permalink
Merge branch 'release/2.22.0' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
guanbinrui committed Aug 22, 2023
2 parents dd049dd + 4fc1c9b commit ad327f9
Show file tree
Hide file tree
Showing 332 changed files with 732 additions and 2,432 deletions.
Binary file modified packages/app/src/assets/chrome.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/app/src/assets/firefox.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/app/src/assets/opera.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions packages/app/src/components/Install.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ export const InstallExtension = memo(() => {
<div className="flex justify-between flex-1">
<p className="flex flex-1 text-sm text-gray-700 dark:text-gray-400">Install Extension</p>
<div className="flex">
<img className="mr-1 w-[20px] h-[20px]" src={ChromeIcon.toString()} />
<img className="mr-1 w-[20px] h-[20px]" src={FirefoxIcon.toString()} />
<img className="w-[20px] h-[20px]" src={OperaIcon.toString()} />
<img className="mr-1 w-[20px] h-[20px]" src={ChromeIcon.toString()} alt="Google Chrome" />
<img className="mr-1 w-[20px] h-[20px]" src={FirefoxIcon.toString()} alt="Firefox" />
<img className="w-[20px] h-[20px]" src={OperaIcon.toString()} alt="Opera" />
</div>
</div>
</div>
Expand Down
Binary file modified packages/dashboard/src/assets/images/MaskWallet.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/dashboard/src/assets/images/PrintBackground.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/dashboard/src/assets/images/Trend.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ export const RestorePersonaFromLocal = memo(function RestorePersonaFromLocal({ o
setFile(null)
setBackupValue('')
setSummary(null)
setPassword('')
setRestoreStatus(RestoreStatus.WaitingInput)
}, [])

Expand Down
2 changes: 1 addition & 1 deletion packages/dashboard/src/pages/SetupPersona/SignUp/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ export const SignUp = memo(function SignUp() {
size="large"
color="primary"
onClick={() => onNext()}
disabled={!personaName}>
disabled={!personaName.trim().length}>
{t.continue()}
</PrimaryButton>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export function PersonaNameUI({ onNext, error, loading }: PersonaNameUIProps) {
size="large"
color="primary"
onClick={() => onNext(personaName)}
disabled={!personaName || loading}>
disabled={!personaName.trim().length || loading}>
{t.continue()}
</PrimaryButton>
</div>
Expand Down
11 changes: 1 addition & 10 deletions packages/icons/brands/Aave.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 1 addition & 7 deletions packages/icons/brands/Arbitrum.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/icons/brands/Arweave.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/icons/brands/Astar.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 1 addition & 4 deletions packages/icons/brands/Avalanche.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 1 addition & 5 deletions packages/icons/brands/BSC.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/icons/brands/Blocto.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 1 addition & 6 deletions packages/icons/brands/Celo.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit ad327f9

Please sign in to comment.