Skip to content

Implement fixes for misc items found in QA #127

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

Merged
drewstone merged 2 commits into from
Jul 19, 2021
Merged

Implement fixes for misc items found in QA #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dfeb04
Implement fixes for misc items found in QA
nepoche Jul 19, 2021
a9ef981
Update packages/apps/src/configs/currencies/currency-config.ts
drewstone Jul 19, 2021
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
4 changes: 2 additions & 2 deletions packages/apps/src/configs/currencies/currency-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import { HarmonyLogo } from '@webb-dapp/apps/configs/logos/HarmonyLogo';

export const currenciesConfig: AppConfig['currencies'] = {
[WebbCurrencyId.EDG]: {
name: 'Edgware token',
name: 'Edgeware token',
symbol: 'EDG',
color: '',
id: WebbCurrencyId.EDG,
icon: React.createElement(EdgewareLogo),
},
[WebbCurrencyId.TEDG]: {
name: 'Edgware test token',
name: 'Edgeware testnet token',
symbol: 'tEDG',
color: '',
id: WebbCurrencyId.TEDG,
Expand Down
4 changes: 2 additions & 2 deletions packages/apps/src/configs/logos/EdgewareLogo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';

function EdgwareLogo() {
function EdgewareLogo() {
return (
<svg viewBox='0 0 248 248' xmlns='http://www.w3.org/2000/svg' xmlnsXlink='http://www.w3.org/1999/xlink'>
<title>{'Bitmap'}</title>
Expand Down Expand Up @@ -28,4 +28,4 @@ function EdgwareLogo() {
);
}

export default EdgwareLogo;
export default EdgewareLogo;
6 changes: 1 addition & 5 deletions packages/react-components/src/AccountManager/AccountManager.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,10 @@ const AccountManagerContent = styled.div<{ open: boolean }>`
.account-avatar {
background: transparent;
}

.account-button-wrapper {
margin: -20px 0;
}
`;

const AccountManagerWrapper = styled.div<any>`
width: 250px;
width: 230px;
height: 0px;
position: relative;
top: -32.5px;
Expand Down
9 changes: 8 additions & 1 deletion packages/react-components/src/AppBar/AppBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,11 @@ const RightNavigation = styled.div`

`}
`;

const AccountManagerContainer = styled.div`
width: 250px;
`;

const NavigationWrapper = styled.ul``;
type AppBarProps = {};

Expand Down Expand Up @@ -145,7 +150,9 @@ const AppBar: React.FC<AppBarProps> = () => {
</IconButton>
</Tooltip>*/}
{!isMobile && <NetworkManager />}
<AccountManager />
<AccountManagerContainer>
<AccountManager />
</AccountManagerContainer>
</RightNavigation>
</AppBarWrapper>
);
Expand Down
14 changes: 6 additions & 8 deletions packages/react-components/src/AppBar/ThemeSwticher.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,12 @@ export const ThemeSwitcher: React.FC<{
/>
<Slide direction={'left'} in={active === 'dark'}>
<div className={'theme-entry dark-theme-entry'} onClick={trigger}>
<svg width='24' height='25' viewBox='0 0 24 25' fill='none' xmlns='http://www.w3.org/2000/svg'>
<path
fill-rule='evenodd'
clip-rule='evenodd'
d='M12 0.886475C18.6 0.886475 24 6.20466 24 12.7047C24 19.2047 18.6 24.5228 12 24.5228C5.4 24.5228 0 19.2047 0 12.7047C0 6.20466 5.4 0.886475 12 0.886475ZM20.1 15.6592C20.7 15.6592 21.3 16.2501 21.3 16.841C21.3 17.4319 20.7 18.0228 20.1 18.0228C19.5 18.0228 18.9 17.4319 18.9 16.841C18.9 16.2501 19.5 15.6592 20.1 15.6592ZM13.5 13.591C14.1 13.591 14.7 14.1819 14.7 14.7728C14.7 15.6592 14.1 16.2501 13.5 16.2501C12.6 16.2501 12 15.6592 12 14.7728C12 14.1819 12.6 13.591 13.5 13.591ZM20.4 6.50011C21 6.50011 21.3 6.79557 21.3 7.38648C21.3 7.68193 21 8.27284 20.4 8.27284C20.1 8.27284 19.8 7.68193 19.8 7.38648C19.8 6.79557 20.1 6.50011 20.4 6.50011ZM18.6 10.341C19.2 10.341 19.8 10.9319 19.8 11.5228C19.8 12.1137 19.2 12.7047 18.6 12.7047C18 12.7047 17.4 12.1137 17.4 11.5228C17.4 10.9319 18 10.341 18.6 10.341ZM12.9 8.27284C13.8 8.27284 14.4 8.86375 14.4 9.45466C14.4 10.341 13.8 10.9319 12.9 10.9319C12.3 10.9319 11.4 10.341 11.4 9.45466C11.4 8.86375 12.3 8.27284 12.9 8.27284ZM14.1 4.43193C14.7 4.43193 15 4.72738 15 5.31829C15 5.61375 14.7 6.20466 14.1 6.20466C13.8 6.20466 13.5 5.61375 13.5 5.31829C13.5 4.72738 13.8 4.43193 14.1 4.43193ZM6.9 5.31829C7.8 4.72738 9 4.43193 9.9 4.43193C7.2 7.09102 6.6 11.2274 8.4 14.7728C10.2 18.3183 14.1 20.091 18 19.5001C17.1 20.3865 16.5 20.9774 15.3 21.2728C10.8 23.6365 5.4 21.8637 3 17.4319C0.6 13.2956 2.4 7.68193 6.9 5.31829Z'
fill='white'
/>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
<title>
moon
</title>
<path d="M17.39 15.14A7.33 7.33 0 0 1 11.75 1.6c.23-.11.56-.23.79-.34a8.19 8.19 0 0 0-5.41.45 9 9 0 1 0 7 16.58 8.42 8.42 0 0 0 4.29-3.84 5.3 5.3 0 0 1-1.03.69z"/>
</svg>
</div>
</Slide>
<Slide direction={'right'} in={active === 'light'}>
Expand Down