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

Tx history change wallet fix #2625

Merged
merged 3 commits into from
Sep 17, 2024
Merged

Tx history change wallet fix #2625

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
c28581a
Fix invalid DOM property `stroke-linejoin`.
kev1n-peters Sep 17, 2024
c81b0a4
Fix wallets not loading after returning from "Transaction history" page
kev1n-peters Sep 17, 2024
cf0659f
added todo
kev1n-peters Sep 17, 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
5 changes: 2 additions & 3 deletions wormhole-connect/src/AppRouter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import Terms from './views/Terms';
import TxSearch from './views/TxSearch';
import { setRoute } from './store/router';
import { clearWallets } from './store/wallet';
import { clearPorticoBridge } from 'store/porticoBridge';
import { useExternalSearch } from 'hooks/useExternalSearch';

import BridgeV2 from 'views/v2/Bridge';
Expand Down Expand Up @@ -80,9 +79,9 @@ function AppRouter(props: Props) {
config.whLegacy.registerProviders(); // reset providers that may have been set during transfer
}
// reset transfer state on leave
if (route === bridgeRoute && prevRoute !== bridgeRoute) {
const isEnteringBridge = route === bridgeRoute && prevRoute !== bridgeRoute;
if (isEnteringBridge && prevRoute !== 'history') {
dispatch(clearTransfer());
dispatch(clearPorticoBridge());
kev1n-peters marked this conversation as resolved.
Show resolved Hide resolved
}
}, [route, prevRoute, dispatch]);

Expand Down
12 changes: 6 additions & 6 deletions wormhole-connect/src/icons/Tokens/ETH.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,37 +15,37 @@ function ETH() {
d="M90.9,181v-45.2l-55.9-32.7,55.9,77.8Z"
fill="#f0cdc2"
stroke="#1616b4"
stroke-linejoin="round"
strokeLinejoin="round"
/>
<path
d="M91.1,181v-45.2l55.9-32.7-55.9,77.8Z"
fill="#c9b3f5"
stroke="#1616b4"
stroke-linejoin="round"
strokeLinejoin="round"
/>
<path
d="M90.9,124.6v-57.6l-56.5,25.3,56.5,32.3Z"
fill="#88aaf1"
stroke="#1616b4"
stroke-linejoin="round"
strokeLinejoin="round"
/>
<path
d="M91.1,124.6v-57.6l56.5,25.3-56.5,32.3Z"
fill="#c9b3f5"
stroke="#1616b4"
stroke-linejoin="round"
strokeLinejoin="round"
/>
<path
d="M34.4,92.3L90.9,1v66l-56.5,25.3Z"
fill="#f0cdc2"
stroke="#1616b4"
stroke-linejoin="round"
strokeLinejoin="round"
/>
<path
d="M147.6,92.3L91.1,1v66l56.5,25.3Z"
fill="#b8faf6"
stroke="#1616b4"
stroke-linejoin="round"
strokeLinejoin="round"
/>
</g>
</g>
Expand Down
1 change: 1 addition & 0 deletions wormhole-connect/src/store/porticoBridge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// TODO: SDKV2 remove this file
import { createSlice, PayloadAction } from '@reduxjs/toolkit';
import {
DataWrapper,
Expand Down
Loading