From 9b34b0bc30efa4479b0dd597955bf829247f7724 Mon Sep 17 00:00:00 2001
From: Dawid Sowa <dawid.sowa@rdx.works>
Date: Wed, 12 Jun 2024 14:37:14 +0200
Subject: [PATCH] feat: add TX ignore

---
 packages/common/src/index.ts                  |   1 +
 packages/connect-button/.storybook/preview.js |   4 +-
 packages/connect-button/README.md             |   4 +-
 packages/connect-button/package.json          |   3 +-
 .../src/assets/icon-ignored.svg               |  10 +
 .../src/components/card/card.stories.ts       |  10 +-
 .../src/components/card/card.ts               |  10 +-
 .../src/components/card/request-card.ts       |  70 ++++-
 .../src/components/card/request-cards.ts      |   9 -
 .../src/components/pages/requests.ts          |   9 -
 packages/dapp-toolkit/package.json            |   5 +-
 .../connect-button/connect-button.module.ts   |  48 +++-
 .../src/modules/connect-button/subjects.ts    |   1 +
 .../request-items/request-item.module.ts      |   9 +-
 .../modules/wallet-request/wallet-request.ts  | 256 ++++++++++--------
 15 files changed, 280 insertions(+), 169 deletions(-)
 create mode 100644 packages/connect-button/src/assets/icon-ignored.svg

diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts
index 9b24e73b..17b89fa3 100644
--- a/packages/common/src/index.ts
+++ b/packages/common/src/index.ts
@@ -32,6 +32,7 @@ export const RequestStatus = {
   success: 'success',
   fail: 'fail',
   cancelled: 'cancelled',
+  ignored: 'ignored',
 } as const
 
 export const RequestItemType = {
diff --git a/packages/connect-button/.storybook/preview.js b/packages/connect-button/.storybook/preview.js
index 7fbc6030..79106bd5 100644
--- a/packages/connect-button/.storybook/preview.js
+++ b/packages/connect-button/.storybook/preview.js
@@ -10,9 +10,7 @@ export const parameters = {
         .replaceAll(':host', '.storybook-wrapper')
       const theme = themeCSS
         .toString()
-        .replace(":host([mode='dark'])", '.storybook-wrapper[mode=dark]')
-        .replace(":host([mode='light'])", '.storybook-wrapper[mode=light]')
-        .replaceAll(':host', '.storybook-wrapper')
+        .replaceAll(/(?::host)\(([a-z=\[\]-]+)\)/g, '.storybook-wrapper$1')
 
       return html`<style>
           ${variables}
diff --git a/packages/connect-button/README.md b/packages/connect-button/README.md
index 5a88e43c..e68ae718 100644
--- a/packages/connect-button/README.md
+++ b/packages/connect-button/README.md
@@ -102,6 +102,7 @@ type ConnectButtonEvents = {
   onConnect: () => void
   onDisconnect: () => void
   onCancelRequestItem: (event: CustomEvent<{ id: string }>) => void
+  onIgnoreTransactionItem: (event: CustomEvent<{ id: string }>) => void
   onDestroy: () => void
   onShowPopover: () => void
   onUpdateSharedData: () => void
@@ -110,7 +111,8 @@ type ConnectButtonEvents = {
 
 - onConnect - triggers when user clicks connect now button
 - onDisconnect - triggers when user clicks disconnect wallet button
-- onCancelRequestItem - triggers when user cancels connect request
+- onCancelRequestItem - triggers when user cancels data or login request
+- onIgnoreTransactionItem - triggers when user ignores transaction output
 - onDestroy - triggers when button is removed from the DOM. Useful for cleaning up registered event listeners and subscriptions.
 - onShowPopover - triggers when users clicks on radix button and popover is being shown
 - onUpdateSharedData - triggers when users clicks on "Update Shared Data" button
diff --git a/packages/connect-button/package.json b/packages/connect-button/package.json
index 48587b3b..deb5e4eb 100644
--- a/packages/connect-button/package.json
+++ b/packages/connect-button/package.json
@@ -79,6 +79,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/radixdlt/connect-button.git"
+    "url": "git+https://github.com/radixdlt/radix-dapp-toolkit.git",
+    "directory": "packages/connect-button"
   }
 }
\ No newline at end of file
diff --git a/packages/connect-button/src/assets/icon-ignored.svg b/packages/connect-button/src/assets/icon-ignored.svg
new file mode 100644
index 00000000..e18235a1
--- /dev/null
+++ b/packages/connect-button/src/assets/icon-ignored.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2822_1933)">
+<path d="M12 2C6.48 2 2 6.48 2 12C2 17.52 6.48 22 12 22C17.52 22 22 17.52 22 12C22 6.48 17.52 2 12 2ZM17 13H7V11H17V13Z" fill="#003057"/>
+</g>
+<defs>
+<clipPath id="clip0_2822_1933">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/connect-button/src/components/card/card.stories.ts b/packages/connect-button/src/components/card/card.stories.ts
index d2aa767f..3e19f7e5 100644
--- a/packages/connect-button/src/components/card/card.stories.ts
+++ b/packages/connect-button/src/components/card/card.stories.ts
@@ -1,5 +1,6 @@
 import { Meta, StoryObj } from '@storybook/web-components'
 import './card'
+
 import './persona-card'
 import './request-card'
 import '../popover/popover'
@@ -89,8 +90,11 @@ export const Requests: Story = {
         status="${args.status}"
         type="${args.type}"
         timestamp=${args.timestamp}
-        @onCancel=${(event: any) => {
-          console.log(event)
+        @onCancelRequestItem=${(event: any) => {
+          console.log('onCancelRequestItem', event)
+        }}
+        @onIgnoreTransactionItem=${(event: any) => {
+          console.log('onIgnoreTransactionItem', event)
         }}
         ?showCancel="${args.showCancel}"
         transactionIntentHash="${args.transactionIntentHash}"
@@ -103,7 +107,7 @@ export const Requests: Story = {
       control: 'select',
     },
     status: {
-      options: ['pending', 'success', 'fail', 'cancelled'],
+      options: ['pending', 'success', 'fail', 'cancelled', 'ignored'],
       control: 'select',
     },
     timestamp: {
diff --git a/packages/connect-button/src/components/card/card.ts b/packages/connect-button/src/components/card/card.ts
index 9eb1f1af..53a2d86f 100644
--- a/packages/connect-button/src/components/card/card.ts
+++ b/packages/connect-button/src/components/card/card.ts
@@ -5,6 +5,7 @@ import UncheckedIcon from '../../assets/unchecked.svg'
 import CheckedIcon from '../../assets/checked.svg'
 import IconLoading from '../../assets/icon-loading.svg'
 import IconFailed from '../../assets/icon-failed.svg'
+import IconIgnored from '../../assets/icon-ignored.svg'
 import { formatTimestamp } from '../../helpers/format-timestamp'
 
 @customElement('radix-card')
@@ -13,7 +14,7 @@ export class RadixCard extends LitElement {
     type: String,
     reflect: true,
   })
-  icon?: 'unchecked' | 'checked' | 'pending' | 'success' | 'error'
+  icon?: 'unchecked' | 'checked' | 'pending' | 'success' | 'error' | 'ignored'
 
   @property({
     type: String,
@@ -120,6 +121,13 @@ export class RadixCard extends LitElement {
         height: 24px;
       }
 
+      :host([icon='ignored']) i::before {
+        -webkit-mask-image: url(${unsafeCSS(IconIgnored)});
+        mask-image: url(${unsafeCSS(IconIgnored)});
+        width: 24px;
+        height: 24px;
+      }
+
       :host([icon='checked']) i::before {
         -webkit-mask-image: url(${unsafeCSS(CheckedIcon)});
         mask-image: url(${unsafeCSS(CheckedIcon)});
diff --git a/packages/connect-button/src/components/card/request-card.ts b/packages/connect-button/src/components/card/request-card.ts
index 1f0e56bc..a33287e2 100644
--- a/packages/connect-button/src/components/card/request-card.ts
+++ b/packages/connect-button/src/components/card/request-card.ts
@@ -5,24 +5,33 @@ import '../account/account'
 import '../link/link'
 import { shortenAddress } from '../../helpers/shorten-address'
 import { classMap } from 'lit/directives/class-map.js'
-import { RequestItemType, RequestStatus } from 'radix-connect-common'
+import {
+  RequestItemTypes,
+  RequestStatusTypes,
+  RequestStatus,
+} from 'radix-connect-common'
 @customElement('radix-request-card')
 export class RadixRequestCard extends LitElement {
   @property({
     type: String,
   })
-  type: keyof typeof RequestItemType = 'dataRequest'
+  type: RequestItemTypes = 'dataRequest'
 
   @property({
     type: String,
   })
-  status: keyof typeof RequestStatus = 'pending'
+  status: RequestStatusTypes = 'pending'
 
   @property({
     type: Boolean,
   })
   showCancel: boolean = false
 
+  @property({
+    type: Boolean,
+  })
+  showIgnore: boolean = false
+
   @property({
     type: String,
   })
@@ -46,18 +55,29 @@ export class RadixRequestCard extends LitElement {
         pending: 'Pending Transaction',
         fail: 'Transaction Failed',
         cancelled: 'Transaction Cancelled',
+        ignored: 'Transaction Ignored',
         success: 'Send transaction',
         content: html`
           ${this.renderTxIntentHash()}
-          ${this.getRequestContentTemplate(
-            'Open your Radix Wallet app to review the transaction',
-          )}
+          ${this.status === 'pending'
+            ? html`<div class="request-content">
+                Open your Radix Wallet app to review the transaction
+                ${this.showCancel
+                  ? html`<div class="cancel" @click=${this.onCancel}>
+                      Cancel
+                    </div>`
+                  : html`<div class="cancel" @click=${this.onIgnore}>
+                      Ignore
+                    </div>`}
+              </div>`
+            : ''}
         `,
       },
       dataRequest: {
         pending: 'Data Request Pending',
         fail: 'Data Request Rejected',
         cancelled: 'Data Request Rejected',
+        ignored: '',
         success: 'Data Request',
         content: this.getRequestContentTemplate(
           'Open Your Radix Wallet App to complete the request',
@@ -68,6 +88,7 @@ export class RadixRequestCard extends LitElement {
         fail: 'Login Request Rejected',
         cancelled: 'Login Request Rejected',
         success: 'Login Request',
+        ignored: '',
         content: this.getRequestContentTemplate(
           'Open Your Radix Wallet App to complete the request',
         ),
@@ -85,7 +106,7 @@ export class RadixRequestCard extends LitElement {
   }
 
   private getRequestContentTemplate(text: string) {
-    return this.status === 'pending'
+    return this.status === RequestStatus.pending
       ? html`<div class="request-content">
           ${text}
           ${this.showCancel
@@ -95,17 +116,29 @@ export class RadixRequestCard extends LitElement {
       : ''
   }
 
+  private isErrorStatus(status: RequestStatusTypes) {
+    return (
+      [
+        RequestStatus.cancelled,
+        RequestStatus.fail,
+        RequestStatus.ignored,
+      ] as string[]
+    ).includes(status)
+  }
+
   private getIconFromStatus() {
-    return this.status === 'pending'
+    return this.status === RequestStatus.pending
       ? 'pending'
-      : this.status === 'cancelled' || this.status === 'fail'
-        ? 'error'
-        : 'checked'
+      : this.status === RequestStatus.ignored
+        ? 'ignored'
+        : this.isErrorStatus(this.status)
+          ? 'error'
+          : 'checked'
   }
 
   private getStylingFromStatus() {
     return classMap({
-      dimmed: this.status === 'fail' || this.status === 'cancelled',
+      dimmed: this.isErrorStatus(this.status),
       inverted: this.status === 'pending',
     })
   }
@@ -123,6 +156,19 @@ export class RadixRequestCard extends LitElement {
     )
   }
 
+  private onIgnore(event: MouseEvent) {
+    this.dispatchEvent(
+      new CustomEvent('onIgnoreTransactionItem', {
+        detail: {
+          ...event,
+          id: this.id,
+        },
+        bubbles: true,
+        composed: true,
+      }),
+    )
+  }
+
   private renderTxIntentHash() {
     return this.transactionIntentHash
       ? html`<div class="transaction">
diff --git a/packages/connect-button/src/components/card/request-cards.ts b/packages/connect-button/src/components/card/request-cards.ts
index f1bd9ba7..882fe79e 100644
--- a/packages/connect-button/src/components/card/request-cards.ts
+++ b/packages/connect-button/src/components/card/request-cards.ts
@@ -17,15 +17,6 @@ export class RadixRequestCards extends LitElement {
           status="${requestItem.status}"
           id="${requestItem.interactionId}"
           ?showCancel="${requestItem.showCancel}"
-          @onCancel=${(event: any) => {
-            this.dispatchEvent(
-              new CustomEvent('onCancel', {
-                detail: event.detail,
-                bubbles: true,
-                composed: true,
-              }),
-            )
-          }}
           timestamp=${requestItem.createdAt}
         ></radix-request-card>`,
     )
diff --git a/packages/connect-button/src/components/pages/requests.ts b/packages/connect-button/src/components/pages/requests.ts
index e0b825d4..16c36e29 100644
--- a/packages/connect-button/src/components/pages/requests.ts
+++ b/packages/connect-button/src/components/pages/requests.ts
@@ -38,15 +38,6 @@ export class RadixRequestsPage extends LitElement {
               id="${requestItem.interactionId}"
               transactionIntentHash="${requestItem.transactionIntentHash || ''}"
               ?showCancel="${requestItem.showCancel}"
-              @onCancel=${(event: any) => {
-                this.dispatchEvent(
-                  new CustomEvent('onCancel', {
-                    detail: event.detail,
-                    bubbles: true,
-                    composed: true,
-                  }),
-                )
-              }}
               timestamp=${requestItem.createdAt}
             ></radix-request-card>`,
         )}
diff --git a/packages/dapp-toolkit/package.json b/packages/dapp-toolkit/package.json
index 1da59b7a..e13f3922 100644
--- a/packages/dapp-toolkit/package.json
+++ b/packages/dapp-toolkit/package.json
@@ -85,9 +85,10 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/radixdlt/radix-dapp-toolkit.git"
+    "url": "git+https://github.com/radixdlt/radix-dapp-toolkit.git",
+    "directory": "packages/dapp-toolkit"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/dapp-toolkit/src/modules/connect-button/connect-button.module.ts b/packages/dapp-toolkit/src/modules/connect-button/connect-button.module.ts
index d3b7f3df..306fe8b8 100644
--- a/packages/dapp-toolkit/src/modules/connect-button/connect-button.module.ts
+++ b/packages/dapp-toolkit/src/modules/connect-button/connect-button.module.ts
@@ -60,7 +60,7 @@ export const ConnectButtonModule = (
   if (!isBrowser()) {
     return ConnectButtonNoopModule()
   }
-  
+
   import('@radixdlt/connect-button')
   const logger = input?.logger?.getSubLogger({ name: 'ConnectButtonModule' })
   const subjects = input.subjects || ConnectButtonSubjects()
@@ -142,6 +142,21 @@ export const ConnectButtonModule = (
             }),
           )
 
+          const onIgnoreTransactionItem$ = fromEvent(
+            connectButtonElement,
+            'onIgnoreTransactionItem',
+          ).pipe(
+            tap((event) => {
+              const id = (event as CustomEvent<{ id: string }>).detail.id
+
+              logger?.debug({
+                method: 'onIgnoreTransactionItem',
+                id,
+              })
+              subjects.onIgnoreTransactionItem.next(id)
+            }),
+          )
+
           const onUpdateSharedData$ = fromEvent(
             connectButtonElement,
             'onUpdateSharedData',
@@ -232,6 +247,7 @@ export const ConnectButtonModule = (
             isExtensionAvailable$,
             onDisconnect$,
             onCancelRequestItem$,
+            onIgnoreTransactionItem$,
             accounts$,
             personaData$,
             personaLabel$,
@@ -286,6 +302,7 @@ export const ConnectButtonModule = (
     onShowPopover$: subjects.onShowPopover.asObservable(),
     onUpdateSharedData$: subjects.onUpdateSharedData.asObservable(),
     onCancelRequestItem$: subjects.onCancelRequestItem.asObservable(),
+    onIgnoreTransactionItem$: subjects.onIgnoreTransactionItem.asObservable(),
     onLinkClick$: subjects.onLinkClick.asObservable(),
     setStatus: (value: RadixButtonStatus) => subjects.status.next(value),
     setTheme: (value: RadixButtonTheme) => subjects.theme.next(value),
@@ -299,7 +316,8 @@ export const ConnectButtonModule = (
     setLoggedInTimestamp: (value: string) =>
       subjects.loggedInTimestamp.next(value),
     setConnected: (value: boolean) => subjects.connected.next(value),
-    setShowPopoverMenu: (value: boolean) => subjects.showPopoverMenu.next(value),
+    setShowPopoverMenu: (value: boolean) =>
+      subjects.showPopoverMenu.next(value),
     setRequestItems: (items: RequestItem[]) =>
       subjects.requestItems.next(items),
     setAccounts: (accounts: Account[]) => subjects.accounts.next(accounts),
@@ -343,6 +361,16 @@ export const ConnectButtonModule = (
       .subscribe(),
   )
 
+  subscriptions.add(
+    subjects.onIgnoreTransactionItem
+      .pipe(
+        tap((value) => {
+          walletRequestModule.ignoreTransaction(value)
+        }),
+      )
+      .subscribe(),
+  )
+
   subscriptions.add(
     walletRequestModule.requestItems$
       .pipe(
@@ -377,13 +405,15 @@ export const ConnectButtonModule = (
     subjects.onConnect
       .pipe(
         switchMap(() =>
-          stateModule.reset().andThen(() =>
-            walletRequestModule.sendRequest({
-              isConnect: true,
-              oneTime: false,
-            }),
-          )
-          .map(() => isMobile() && subjects.showPopoverMenu.next(false)),
+          stateModule
+            .reset()
+            .andThen(() =>
+              walletRequestModule.sendRequest({
+                isConnect: true,
+                oneTime: false,
+              }),
+            )
+            .map(() => isMobile() && subjects.showPopoverMenu.next(false)),
         ),
       )
       .subscribe(),
diff --git a/packages/dapp-toolkit/src/modules/connect-button/subjects.ts b/packages/dapp-toolkit/src/modules/connect-button/subjects.ts
index 476860af..d1efb05b 100644
--- a/packages/dapp-toolkit/src/modules/connect-button/subjects.ts
+++ b/packages/dapp-toolkit/src/modules/connect-button/subjects.ts
@@ -11,6 +11,7 @@ export const ConnectButtonSubjects = () => ({
   connected: new ReplaySubject<boolean>(1),
   requestItems: new BehaviorSubject<RequestItem[]>([]),
   onCancelRequestItem: new Subject<string>(),
+  onIgnoreTransactionItem: new Subject<string>(),
   accounts: new BehaviorSubject<Account[]>([]),
   onShowPopover: new Subject<void>(),
   status: new BehaviorSubject<ConnectButtonStatus>('default'),
diff --git a/packages/dapp-toolkit/src/modules/wallet-request/request-items/request-item.module.ts b/packages/dapp-toolkit/src/modules/wallet-request/request-items/request-item.module.ts
index 749dd67a..0b6036ff 100644
--- a/packages/dapp-toolkit/src/modules/wallet-request/request-items/request-item.module.ts
+++ b/packages/dapp-toolkit/src/modules/wallet-request/request-items/request-item.module.ts
@@ -1,4 +1,8 @@
-import type { RequestItem, RequestStatusTypes } from 'radix-connect-common'
+import {
+  RequestStatus,
+  type RequestItem,
+  type RequestStatusTypes,
+} from 'radix-connect-common'
 import { Subscription, filter, map, switchMap } from 'rxjs'
 import { Logger } from '../../../helpers'
 import { ErrorType } from '../../../error'
@@ -79,7 +83,8 @@ export const RequestItemModule = (input: RequestItemModuleInput) => {
         if (item) {
           const updated = {
             ...item,
-            status,
+            status:
+              item.status === RequestStatus.ignored ? item.status : status,
           } as RequestItem
           if (updated.status === 'fail') {
             updated.error = error!
diff --git a/packages/dapp-toolkit/src/modules/wallet-request/wallet-request.ts b/packages/dapp-toolkit/src/modules/wallet-request/wallet-request.ts
index c3667432..7da6ee7b 100644
--- a/packages/dapp-toolkit/src/modules/wallet-request/wallet-request.ts
+++ b/packages/dapp-toolkit/src/modules/wallet-request/wallet-request.ts
@@ -70,6 +70,7 @@ export const WalletRequestModule = (input: {
   const useCache = input.useCache
   const networkId = input.networkId
   const cancelRequestSubject = new Subject<string>()
+  const ignoreTransactionSubject = new Subject<string>()
   const interactionStatusChangeSubject = new Subject<'fail' | 'success'>()
   const gatewayModule = input.providers.gatewayModule
   const dAppDefinitionAddress = input.dAppDefinitionAddress
@@ -147,6 +148,19 @@ export const WalletRequestModule = (input: {
             ),
           ),
         )
+        firstValueFrom(
+          ignoreTransactionSubject.pipe(
+            filter((requestItemId) => requestItemId === id),
+            switchMap(() =>
+              requestItemModule
+                .updateStatus({
+                  id,
+                  status: 'ignored',
+                })
+                .andThen(() => cancelRequest()),
+            ),
+          ),
+        )
       },
     } satisfies Parameters<WalletRequestSdk['request']>[1]
   }
@@ -266,130 +280,132 @@ export const WalletRequestModule = (input: {
     return ResultAsync.combine([
       getChallenge(dataRequestState),
       stateModule.getState().mapErr(() => SdkError('FailedToReadRdtState', '')),
-    ]).andThen(([challenge, state]) =>
-      toWalletRequest({
-        dataRequestState,
-        isConnect,
-        oneTime,
-        challenge,
-        walletData: state.walletData,
-      })
-        .mapErr(() => SdkError('FailedToTransformWalletRequest', ''))
-        .asyncAndThen((walletDataRequest) => {
-          const walletInteraction: WalletInteraction =
-            walletRequestSdk.createWalletInteraction(walletDataRequest)
-
-          if (
-            canDataRequestBeResolvedByRdtState(walletDataRequest, state) &&
-            useCache
-          )
-            return okAsync(state.walletData)
-
-          const isLoginRequest =
-            !state.walletData.persona &&
-            walletDataRequest.discriminator === 'authorizedRequest'
-
-          return requestItemModule
-            .add({
-              type: isLoginRequest ? 'loginRequest' : 'dataRequest',
-              walletInteraction,
-              isOneTimeRequest: oneTime,
-            })
-            .mapErr(({ message }) =>
-              SdkError(
-                'FailedToCreateRequestItem',
-                walletInteraction.interactionId,
-                message,
-              ),
+    ])
+      .andThen(([challenge, state]) =>
+        toWalletRequest({
+          dataRequestState,
+          isConnect,
+          oneTime,
+          challenge,
+          walletData: state.walletData,
+        })
+          .mapErr(() => SdkError('FailedToTransformWalletRequest', ''))
+          .asyncAndThen((walletDataRequest) => {
+            const walletInteraction: WalletInteraction =
+              walletRequestSdk.createWalletInteraction(walletDataRequest)
+
+            if (
+              canDataRequestBeResolvedByRdtState(walletDataRequest, state) &&
+              useCache
             )
-            .andThen(() =>
-              sendDataRequest(walletInteraction)
-                .andThen((walletInteractionResponse) => {
-                  if (
-                    walletInteractionResponse.discriminator === 'success' &&
-                    walletInteractionResponse.items.discriminator !==
-                      'transaction'
-                  )
-                    return ok(walletInteractionResponse.items)
-
-                  return err(
-                    SdkError(
-                      'WalletResponseFailure',
-                      walletInteractionResponse.interactionId,
-                      'expected data response',
-                    ),
-                  )
-                })
-                .andThen(transformWalletResponseToRdtWalletData)
-                .andThen((transformedWalletResponse) => {
-                  if (dataRequestControl)
-                    return dataRequestControl(transformedWalletResponse)
-                      .andThen(() =>
-                        requestItemModule
-                          .updateStatus({
+              return okAsync(state.walletData)
+
+            const isLoginRequest =
+              !state.walletData.persona &&
+              walletDataRequest.discriminator === 'authorizedRequest'
+
+            return requestItemModule
+              .add({
+                type: isLoginRequest ? 'loginRequest' : 'dataRequest',
+                walletInteraction,
+                isOneTimeRequest: oneTime,
+              })
+              .mapErr(({ message }) =>
+                SdkError(
+                  'FailedToCreateRequestItem',
+                  walletInteraction.interactionId,
+                  message,
+                ),
+              )
+              .andThen(() =>
+                sendDataRequest(walletInteraction)
+                  .andThen((walletInteractionResponse) => {
+                    if (
+                      walletInteractionResponse.discriminator === 'success' &&
+                      walletInteractionResponse.items.discriminator !==
+                        'transaction'
+                    )
+                      return ok(walletInteractionResponse.items)
+
+                    return err(
+                      SdkError(
+                        'WalletResponseFailure',
+                        walletInteractionResponse.interactionId,
+                        'expected data response',
+                      ),
+                    )
+                  })
+                  .andThen(transformWalletResponseToRdtWalletData)
+                  .andThen((transformedWalletResponse) => {
+                    if (dataRequestControl)
+                      return dataRequestControl(transformedWalletResponse)
+                        .andThen(() =>
+                          requestItemModule
+                            .updateStatus({
+                              id: walletInteraction.interactionId,
+                              status: 'success',
+                            })
+                            .mapErr((error) =>
+                              SdkError(
+                                error.reason,
+                                walletInteraction.interactionId,
+                              ),
+                            )
+                            .map(() => transformedWalletResponse),
+                        )
+                        .mapErr((error) => {
+                          requestItemModule.updateStatus({
                             id: walletInteraction.interactionId,
-                            status: 'success',
+                            status: 'fail',
+                            error: error.error,
                           })
-                          .mapErr((error) =>
-                            SdkError(
-                              error.reason,
-                              walletInteraction.interactionId,
-                            ),
+                          return SdkError(
+                            error.error,
+                            walletInteraction.interactionId,
                           )
-                          .map(() => transformedWalletResponse),
-                      )
-                      .mapErr((error) => {
-                        requestItemModule.updateStatus({
-                          id: walletInteraction.interactionId,
-                          status: 'fail',
-                          error: error.error,
                         })
-                        return SdkError(
-                          error.error,
-                          walletInteraction.interactionId,
-                        )
-                      })
 
-                  return requestItemModule
-                    .updateStatus({
-                      id: walletInteraction.interactionId,
-                      status: 'success',
-                    })
-                    .map(() => transformedWalletResponse)
-                    .mapErr((error) =>
-                      SdkError(error.reason, walletInteraction.interactionId),
-                    )
-                })
-                .map((transformedWalletResponse) => {
-                  interactionStatusChangeSubject.next('success')
-
-                  if (!oneTime) {
-                    stateModule
-                      .setState({
-                        loggedInTimestamp: Date.now().toString(),
-                        walletData: transformedWalletResponse,
-                        sharedData: transformWalletRequestToSharedData(
-                          walletInteraction,
-                          state.sharedData,
-                        ),
-                      })
-                      .map(() => {
-                        stateModule.emitWalletData()
+                    return requestItemModule
+                      .updateStatus({
+                        id: walletInteraction.interactionId,
+                        status: 'success',
                       })
-                  }
-
-                  return transformedWalletResponse
-                })
-                .mapErr((err) => {
-                  interactionStatusChangeSubject.next('fail')
-                  return err
-                }),
-            )
-        }),
-    ).mapErr((error) => {
-      logger?.error(error)
-      return error;
-    })
+                      .map(() => transformedWalletResponse)
+                      .mapErr((error) =>
+                        SdkError(error.reason, walletInteraction.interactionId),
+                      )
+                  })
+                  .map((transformedWalletResponse) => {
+                    interactionStatusChangeSubject.next('success')
+
+                    if (!oneTime) {
+                      stateModule
+                        .setState({
+                          loggedInTimestamp: Date.now().toString(),
+                          walletData: transformedWalletResponse,
+                          sharedData: transformWalletRequestToSharedData(
+                            walletInteraction,
+                            state.sharedData,
+                          ),
+                        })
+                        .map(() => {
+                          stateModule.emitWalletData()
+                        })
+                    }
+
+                    return transformedWalletResponse
+                  })
+                  .mapErr((err) => {
+                    interactionStatusChangeSubject.next('fail')
+                    return err
+                  }),
+              )
+          }),
+      )
+      .mapErr((error) => {
+        logger?.error(error)
+        return error
+      })
   }
 
   const setRequestDataState = (...items: DataRequestBuilderItem[]) => {
@@ -570,6 +586,11 @@ export const WalletRequestModule = (input: {
     interactionStatusChangeSubject.next('fail')
   }
 
+  const ignoreTransaction = (id: string) => {
+    ignoreTransactionSubject.next(id)
+    interactionStatusChangeSubject.next('fail')
+  }
+
   const provideChallengeGenerator = (fn: () => Promise<string>) => {
     challengeGeneratorFn = fn
   }
@@ -615,6 +636,7 @@ export const WalletRequestModule = (input: {
     },
     sendTransaction,
     cancelRequest,
+    ignoreTransaction,
     requestItemModule,
     provideChallengeGenerator,
     provideDataRequestControl,