nft checkout update

packages/@magic-ext/web3modal-ethers5/src/index.ts

@@ -80,11 +80,13 @@ export class Web3ModalExtension extends Extension.Internal<'web3modal'> {
  private connectToWeb3modal(payloadId: string) {
  const { modal } = this;
 
- const promiEvent = this.utils.createPromiEvent<string[]>(() => {
- // If user is already connected, emit event and return
- if (this.modal.getIsConnected()) {
- this.handleUserConnected(payloadId);
- return;
+ const promiEvent = this.utils.createPromiEvent<string[]>(async () => {
+ try {
+ if (modal.getIsConnected()) {
+ await modal.disconnect();
+ }
+ } catch (error) {
+ console.error(error);
  }
 
  // Listen for wallet connected event

packages/@magic-sdk/provider/src/modules/nft.ts

@@ -21,49 +21,35 @@ export class NFTModule extends BaseModule {
 
  /* Start an NFT Checkout flow with Paypal */
  public checkout(options: NFTCheckoutRequest) {
- // const promiEvent = createPromiEvent<any, NFTCheckoutEvents>((resolve) => {
- // How to tell if user is logged in with a third-party wallet
-
- // TODO: remove this line after testing
- // const isThirdPartyWalletConnected = true;
  const isThirdPartyWalletConnected = this.sdk.thirdPartyWallets.isConnected;
- console.log({ isThirdPartyWalletConnected });
 
  const requestPayload = createJsonRpcRequestPayload(MagicPayloadMethod.NFTCheckout, [
  {
  ...options,
- // Indicating to iframe if third party wallet
  walletProvider: isThirdPartyWalletConnected ? 'web3modal' : 'magic',
  },
  ]);
  const req = this.request<NFTCheckoutResponse>(requestPayload);
 
  // Add intermediary event listener if user is purchasing with a third-party wallet
  if (isThirdPartyWalletConnected) {
- // Listen for `nft-checkout-initiated` event from iframe
  req.on(NftCheckoutEventOnReceived.Initiated as any, async (rawTransaction) => {
  try {
- console.log('RECEIVED', rawTransaction);
  // prompt third party wallet with transaction details
  const hash = await this.request({
  method: 'eth_sendTransaction',
  params: [rawTransaction],
  });
 
- console.log({ hash });
- // emit `nft-checkout-success` intermediary event to iframe if developer sent tx
+ console.log('hash from sdk', hash);
  this.createIntermediaryEvent(NftCheckoutEventEmit.Success, requestPayload.id as string)(hash);
  } catch (error) {
- console.log(error);
- // if rejected, emit `nft-checkout-failure` intermediary event to iframe
+ console.error('error from sdk', error);
  this.createIntermediaryEvent(NftCheckoutEventEmit.Failure, requestPayload.id as string)();
  }
  });
  }
  return req;
- // resolve(req);
- // });
- // return promiEvent;
  }
 
  /* Start an NFT Transfer flow */