Skip to content

Commit 4eb9e1a

Browse files
authored
Fix/lw 11840 tx list unresponsive nami mode (#1547)
1 parent a2315b9 commit 4eb9e1a

File tree

7 files changed

+296
-184
lines changed

7 files changed

+296
-184
lines changed

apps/browser-extension-wallet/src/views/nami-mode/NamiView.tsx

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,10 @@ export const NamiView = withDappContext((): React.ReactElement => {
132132
}, [passwordUtil, setDelegationTxBuilder, setDelegationTxFee, setIsBuildingTx]);
133133

134134
const rewardAccounts = useObservable(inMemoryWallet.delegation.rewardAccounts$);
135-
const protocolParameters = useObservable(inMemoryWallet?.protocolParameters$);
136135
const isStakeRegistered =
137136
rewardAccounts && rewardAccounts[0].credentialStatus === Wallet.Cardano.StakeCredentialStatus.Registered;
138137
const { balance } = useBalances(priceResult?.cardano?.price);
139-
const { coinBalance: minAda } = walletBalanceTransformer(protocolParameters?.stakeKeyDeposit.toString());
138+
const { coinBalance: minAda } = walletBalanceTransformer(walletState?.protocolParameters?.stakeKeyDeposit.toString());
140139
const coinBalance = balance?.total?.coinBalance && Number(balance?.total?.coinBalance);
141140
const hasNoFunds = (coinBalance < Number(minAda) && !isStakeRegistered) || (coinBalance === 0 && isStakeRegistered);
142141

@@ -160,23 +159,6 @@ export const NamiView = withDappContext((): React.ReactElement => {
160159
});
161160
}, [backgroundServices, namiMigration]);
162161

163-
const getTxInputsValueAndAddress = useCallback(
164-
async (inputs: Wallet.Cardano.TxIn[] | Wallet.Cardano.HydratedTxIn[]) =>
165-
await Wallet.getTxInputsValueAndAddress(inputs, chainHistoryProvider, inMemoryWallet),
166-
[chainHistoryProvider, inMemoryWallet]
167-
);
168-
169-
const sortedTx = useMemo(
170-
() =>
171-
walletState
172-
? [
173-
...walletState.transactions.outgoing.inFlight,
174-
...walletState.transactions.history.sort((tx1, tx2) => tx2.blockHeader.slot - tx1.blockHeader.slot)
175-
]
176-
: undefined,
177-
[walletState]
178-
);
179-
180162
const openHWFlow = useCallback(
181163
(path: string) => {
182164
backgroundServices.handleOpenNamiBrowser({ path });
@@ -244,14 +226,16 @@ export const NamiView = withDappContext((): React.ReactElement => {
244226
switchWalletMode,
245227
openExternalLink,
246228
walletAddresses,
247-
transactions: sortedTx,
229+
transactions: walletState?.transactions,
248230
eraSummaries: walletState?.eraSummaries,
249-
getTxInputsValueAndAddress,
250231
certificateInspectorFactory,
251232
connectHW,
252233
createHardwareWalletRevamped,
253234
saveHardwareWallet,
254-
setDeletingWallet
235+
setDeletingWallet,
236+
chainHistoryProvider,
237+
protocolParameters: walletState?.protocolParameters,
238+
assetInfo: walletState?.assetInfo
255239
}}
256240
>
257241
<CommonOutsideHandlesProvider

packages/core/src/ui/components/AddressCard/AddressDisplayItem.module.scss

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
color: var(--light-mode-dark-grey, var(--color-white)) !important;
1111
transition: transform 0.5s ease-in-out;
1212
}
13-
13+
1414
&:hover {
1515
svg:last-of-type {
1616
transform: rotate(180deg);
@@ -27,29 +27,31 @@
2727
}
2828
}
2929

30-
:global {
31-
.ant-dropdown-menu {
32-
border-radius: size_unit(1) !important;
33-
padding: size_unit(1) size_unit(2) !important;
34-
background-color: var(--dark-mode-mid-black, var(--color-white)) !important;
35-
}
30+
.wrapper {
31+
:global {
32+
.ant-dropdown-menu {
33+
border-radius: size_unit(1) !important;
34+
padding: size_unit(1) size_unit(2) !important;
35+
background-color: var(--dark-mode-mid-black, var(--color-white)) !important;
36+
}
3637

37-
.ant-dropdown-menu-item {
38-
padding: size_unit(1.5) 0 !important;
39-
color: var(--text-color-primary) !important;
38+
.ant-dropdown-menu-item {
39+
padding: size_unit(1.5) 0 !important;
40+
color: var(--text-color-primary) !important;
4041

41-
&:hover {
42-
background-color: inherit !important;
42+
&:hover {
43+
background-color: inherit !important;
44+
}
4345
}
44-
}
4546

46-
.ant-dropdown-menu-item:not(:last-child) {
47-
border-bottom: 1px solid var(--dark-mode-mid-grey, var(--light-mode-light-grey-plus));
48-
}
49-
50-
.ant-dropdown-menu-title-content {
51-
svg {
52-
color: var(--text-color-secondary);
47+
.ant-dropdown-menu-item:not(:last-child) {
48+
border-bottom: 1px solid var(--dark-mode-mid-grey, var(--light-mode-light-grey-plus));
49+
}
50+
51+
.ant-dropdown-menu-title-content {
52+
svg {
53+
color: var(--text-color-secondary);
54+
}
5355
}
5456
}
5557
}

packages/core/src/ui/components/AddressCard/AddressDisplayItem.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,13 @@ export const AddressDisplayItem = ({
6666
);
6767

6868
return displayAsMenu ? (
69-
<Dropdown menu={{ items }} placement="top" autoAdjustOverflow dropdownRender={dropdownRender}>
69+
<Dropdown
70+
overlayClassName={styles.wrapper}
71+
menu={{ items }}
72+
placement="top"
73+
autoAdjustOverflow
74+
dropdownRender={dropdownRender}
75+
>
7076
{content}
7177
</Dropdown>
7278
) : (

0 commit comments

Comments
 (0)