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.

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

Jump to bottom

Release/aa hc snap frontend wallet #14

Closed
wants to merge 3 commits into from
Closed

Release/aa hc snap frontend wallet #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f56e2e1
updated package version
meanMonk Jun 21, 2024
971e7fd
change: fixes header values.
meanMonk Jun 21, 2024
5a4905c
change update version of snap.
meanMonk Jun 21, 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
24 changes: 9 additions & 15 deletions packages/site/src/components/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import React, { useContext } from 'react';
import semver from 'semver';
import styled from 'styled-components';
import Logo from '../assets/boba-logo.png';
import { HeaderButtons } from './Buttons';
import snapPackageInfo from '../../../snap/package.json';
import packageInfo from '../../package.json';
import { defaultSnapOrigin } from '../config';
import Logo from '../assets/boba-logo.png';
import { defaultSnapOrigin, snapPackageInfoVersion } from '../config';
import { MetamaskActions, MetaMaskContext } from '../hooks';
import { connectSnap, getSnap } from '../utils';
import { HeaderButtons } from './Buttons';

const HeaderWrapper = styled.header`
display: flex;
Expand Down Expand Up @@ -58,7 +57,7 @@ export const Header = () => {

const updateAvailable = Boolean(
state?.installedSnap &&
semver.gt(snapPackageInfo.version, state.installedSnap?.version),
semver.gt(snapPackageInfoVersion, state.installedSnap?.version),
);

const handleConnectClick = async () => {
Expand All @@ -85,22 +84,17 @@ export const Header = () => {
return (
<VersionStyle>
<div>
<b>Dapp version: </b>
{packageInfo.version}
</div>

<div>
<b>Snap version (expected): </b>
{snapPackageInfo.version}
<span>Snap version (expected): </span>
{snapPackageInfoVersion}
</div>

{state.installedSnap ? (
<div>
<b>Snap version (installed): </b> {state.installedSnap?.version}
<span>Snap version (installed): </span> {state.installedSnap?.version}
</div>
) : (
<div>
<b>Snap version (to install): </b> {snapPackageInfo.version}
<span>Snap version (to install): </span> {snapPackageInfoVersion}
</div>
)}

Expand All @@ -116,7 +110,7 @@ export const Header = () => {
<Title>AA HC Wallet</Title>
</LogoWrapper>
<RightContainer>
{/* <Version /> */}
<Version />
<HeaderButtons
state={state}
onConnectClick={handleConnectClick}
Expand Down
2 changes: 1 addition & 1 deletion packages/site/src/config/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { defaultSnapOrigin } from './snap';
export { defaultSnapOrigin, snapPackageInfoVersion } from './snap';
2 changes: 2 additions & 0 deletions packages/site/src/config/snap.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
*/
export const defaultSnapOrigin =
process.env.GATSBY_SNAP_ORIGIN ?? `local:http://localhost:8080`;

export const snapPackageInfoVersion = '1.1.3';
5 changes: 2 additions & 3 deletions packages/site/src/utils/snap.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import snapPackageInfo from '../../../snap/package.json';
import { defaultSnapOrigin } from '../config';
import { defaultSnapOrigin, snapPackageInfoVersion } from '../config';
import type { GetSnapsResponse, Snap } from '../types';

/**
Expand All @@ -22,7 +21,7 @@ export const getSnaps = async (): Promise<GetSnapsResponse> => {
export const connectSnap = async (
snapId: string = defaultSnapOrigin,
params: Record<'version' | string, unknown> = {
version: snapPackageInfo.version,
version: snapPackageInfoVersion,
},
) => {
// check for current connected chain and force user to switch to boba sepolia.
Expand Down