Skip to content

Commit 1b24ad5

Browse files
authored
fix(extension): [LW-10227] fix 2nd dapp transaction overwriting first (#1032)
1 parent 02a2172 commit 1b24ad5

File tree

1 file changed

+2
-31
lines changed

1 file changed

+2
-31
lines changed

apps/browser-extension-wallet/src/features/dapp/components/confirm-transaction/DappTransactionContainer.tsx

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ import { useViewsFlowContext } from '@providers/ViewFlowProvider';
77
import { Wallet } from '@lace/cardano';
88
import { withAddressBookContext } from '@src/features/address-book/context';
99
import { useWalletStore } from '@stores';
10-
import { exposeApi, RemoteApiPropertyType } from '@cardano-sdk/web-extension';
11-
import { DAPP_CHANNELS } from '@src/utils/constants';
12-
import { runtime } from 'webextension-polyfill';
1310
import { useFetchCoinPrice, useChainHistoryProvider } from '@hooks';
1411
import {
1512
createTxInspector,
@@ -21,11 +18,9 @@ import {
2118
} from '@cardano-sdk/core';
2219
import { createWalletAssetProvider } from '@cardano-sdk/wallet';
2320
import { Skeleton } from 'antd';
24-
import type { UserPromptService } from '@lib/scripts/background/services';
25-
import { of, take } from 'rxjs';
2621

2722
import { useCurrencyStore, useAppSettingsContext } from '@providers';
28-
import { logger, signingCoordinator } from '@lib/wallet-api-ui';
23+
import { logger } from '@lib/wallet-api-ui';
2924
import { useComputeTxCollateral } from '@hooks/useComputeTxCollateral';
3025
import { utxoAndBackendChainHistoryResolver } from '@src/utils/utxo-chain-history-resolver';
3126

@@ -36,7 +31,7 @@ interface DappTransactionContainerProps {
3631
export const DappTransactionContainer = withAddressBookContext(
3732
({ errorMessage }: DappTransactionContainerProps): React.ReactElement => {
3833
const {
39-
signTxRequest: { request: req, set: setSignTxRequest },
34+
signTxRequest: { request: req },
4035
dappInfo
4136
} = useViewsFlowContext();
4237

@@ -78,30 +73,6 @@ export const DappTransactionContainer = withAddressBookContext(
7873
const tx = useMemo(() => req?.transaction.toCore(), [req?.transaction]);
7974
const txCollateral = useComputeTxCollateral(walletState, tx);
8075

81-
useEffect(() => {
82-
const subscription = signingCoordinator.transactionWitnessRequest$.pipe(take(1)).subscribe(async (r) => {
83-
setSignTxRequest(r);
84-
});
85-
86-
const api = exposeApi<Pick<UserPromptService, 'readyToSignTx'>>(
87-
{
88-
api$: of({
89-
async readyToSignTx(): Promise<boolean> {
90-
return Promise.resolve(true);
91-
}
92-
}),
93-
baseChannel: DAPP_CHANNELS.userPrompt,
94-
properties: { readyToSignTx: RemoteApiPropertyType.MethodReturningPromise }
95-
},
96-
{ logger: console, runtime }
97-
);
98-
99-
return () => {
100-
subscription.unsubscribe();
101-
api.shutdown();
102-
};
103-
}, [setSignTxRequest]);
104-
10576
const userAddresses = useMemo(() => walletInfo.addresses.map((v) => v.address), [walletInfo.addresses]);
10677
const userRewardAccounts = useObservable(inMemoryWallet.delegation.rewardAccounts$);
10778
const rewardAccountsAddresses = useMemo(() => userRewardAccounts?.map((key) => key.address), [userRewardAccounts]);

0 commit comments

Comments
 (0)