Merge pull request #238 from radixdlt/do-not-request-persona-data-whe…

…n-updating-accounts fix: do not request persona data
radixdlt · Jul 2, 2024 · 245367a · 245367a
2 parents f7b7ac1 + 88d4882
commit 245367a
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 22 deletions.
diff --git a/docs/v2.md b/docs/v2.md
@@ -32,6 +32,10 @@ Detailed installation guide can be found in [@radixdlt/babylon-gateway-api-sdk](
 import { Logger } from '@radixdlt/radix-dapp-toolkit'
 ```
 
+### onUpdateSharedData -> onUpdateSharedAccounts
+
+User can only update shared accounts during single login session. Persona data will no longer be requested from wallet. Because of that change callback has been renamed.
+
 ### Monorepo
 
 Following npm packages are no longer released independently

diff --git a/packages/connect-button/README.md b/packages/connect-button/README.md
@@ -95,7 +95,7 @@ type ConnectButtonEvents = {
   onIgnoreTransactionItem: (event: CustomEvent<{ id: string }>) => void
   onDestroy: () => void
   onShowPopover: () => void
-  onUpdateSharedData: () => void
+  onUpdateSharedAccounts: () => void
 }
 ```
 
@@ -105,7 +105,7 @@ type ConnectButtonEvents = {
 - 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
+- onUpdateSharedAccounts - triggers when users clicks on "Update Account Sharing" button
 
 # License
 

diff --git a/packages/connect-button/src/components/connect-button.ts b/packages/connect-button/src/components/connect-button.ts
@@ -235,8 +235,9 @@ export class ConnectButton extends LitElement {
         )
       }}
       @onUpdateData=${() => {
+        if (!this.accounts.length) return
         this.dispatchEvent(
-          new CustomEvent('onUpdateSharedData', {
+          new CustomEvent('onUpdateSharedAccounts', {
             bubbles: true,
             composed: true,
           }),

diff --git a/packages/connect-button/src/components/pages/sharing.ts b/packages/connect-button/src/components/pages/sharing.ts
@@ -9,6 +9,7 @@ import '../themed-button/themed-button'
 import RefreshIcon from '../../assets/refresh.svg'
 import LogoutIcon from '../../assets/logout.svg'
 import { pageStyles } from './styles'
+import { classMap } from 'lit/directives/class-map.js'
 
 @customElement('radix-sharing-page')
 export class RadixSharingPage extends LitElement {
@@ -77,8 +78,20 @@ export class RadixSharingPage extends LitElement {
         </div>
       </div>
       <div class="buttons">
-        <radix-themed-button class="full" @click=${this.onUpdateData}>
-          <div class="icon update-data"></div>
+        <radix-themed-button
+          class=${classMap({
+            full: true,
+            disabled: this.accounts.length === 0,
+          })}
+          @click=${this.onUpdateData}
+        >
+          <div
+            class=${classMap({
+              icon: true,
+              'update-data': true,
+              disabled: this.accounts.length === 0,
+            })}
+          ></div>
           Update Account Sharing
         </radix-themed-button>
         <radix-themed-button class="full" @click=${this.onLogout}>
@@ -105,6 +118,9 @@ export class RadixSharingPage extends LitElement {
         width: 20px;
         height: 20px;
       }
+      .icon.disabled::before {
+        background: var(--radix-button-disabled-text-color);
+      }
       .content {
         max-height: 193px;
         overflow-x: hidden;

diff --git a/packages/connect-button/src/components/themed-button/themed-button.ts b/packages/connect-button/src/components/themed-button/themed-button.ts
@@ -47,6 +47,7 @@ export class RadixThemedButton extends LitElement {
         background: var(--radix-button-disabled-background);
         color: var(--radix-button-disabled-text-color);
         cursor: default;
+        pointer-events: none;
       }
     `,
   ]

diff --git a/packages/dapp-toolkit/src/_types.ts b/packages/dapp-toolkit/src/_types.ts
@@ -126,7 +126,7 @@ export type WalletApi = {
     fn: (result: AwaitedWalletDataRequestResult) => void,
   ) => void
   dataRequestControl: (fn: (walletResponse: WalletData) => Promise<any>) => void
-  updateSharedData: () => WalletDataRequestResult
+  updateSharedAccounts: () => WalletDataRequestResult
   sendTransaction: (input: SendTransactionInput) => SendTransactionResult
   setRequestData: (...dataRequestBuilderItem: DataRequestBuilderItem[]) => void
   sendRequest: () => WalletDataRequestResult

diff --git a/packages/dapp-toolkit/src/modules/connect-button/connect-button-noop.module.ts b/packages/dapp-toolkit/src/modules/connect-button/connect-button-noop.module.ts
@@ -6,7 +6,7 @@ export const ConnectButtonNoopModule = (): ConnectButtonModuleOutput => {
     status$: NEVER,
     onConnect$: NEVER,
     onDisconnect$: NEVER,
-    onUpdateSharedData$: NEVER,
+    onUpdateSharedAccounts$: NEVER,
     onShowPopover$: NEVER,
     onCancelRequestItem$: NEVER,
     onLinkClick$: NEVER,

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
@@ -153,13 +153,13 @@ export const ConnectButtonModule = (
             }),
           )
 
-          const onUpdateSharedData$ = fromEvent(
+          const onUpdateSharedAccounts$ = fromEvent(
             connectButtonElement,
-            'onUpdateSharedData',
+            'onUpdateSharedAccounts',
           ).pipe(
             tap(() => {
-              logger?.debug(`onUpdateSharedData`)
-              subjects.onUpdateSharedData.next()
+              logger?.debug(`onUpdateSharedAccounts`)
+              subjects.onUpdateSharedAccounts.next()
             }),
           )
 
@@ -251,7 +251,7 @@ export const ConnectButtonModule = (
             accounts$,
             personaData$,
             personaLabel$,
-            onUpdateSharedData$,
+            onUpdateSharedAccounts$,
             onShowPopover$,
             dAppName$,
             onLinkClick$,
@@ -310,7 +310,7 @@ export const ConnectButtonModule = (
     onConnect$: subjects.onConnect.asObservable(),
     onDisconnect$: subjects.onDisconnect.asObservable(),
     onShowPopover$: subjects.onShowPopover.asObservable(),
-    onUpdateSharedData$: subjects.onUpdateSharedData.asObservable(),
+    onUpdateSharedAccounts$: subjects.onUpdateSharedAccounts.asObservable(),
     onCancelRequestItem$: subjects.onCancelRequestItem.asObservable(),
     onIgnoreTransactionItem$: subjects.onIgnoreTransactionItem.asObservable(),
     onLinkClick$: subjects.onLinkClick.asObservable(),
@@ -430,8 +430,8 @@ export const ConnectButtonModule = (
   )
 
   subscriptions.add(
-    subjects.onUpdateSharedData
-      .pipe(switchMap(() => walletRequestModule.updateSharedData()))
+    subjects.onUpdateSharedAccounts
+      .pipe(switchMap(() => walletRequestModule.updateSharedAccounts()))
       .subscribe(),
   )
 

diff --git a/packages/dapp-toolkit/src/modules/connect-button/subjects.ts b/packages/dapp-toolkit/src/modules/connect-button/subjects.ts
@@ -7,7 +7,7 @@ export type ConnectButtonSubjects = ReturnType<typeof ConnectButtonSubjects>
 export const ConnectButtonSubjects = () => ({
   onConnect: new Subject<{ challenge: string } | undefined>(),
   onDisconnect: new Subject<void>(),
-  onUpdateSharedData: new Subject<void>(),
+  onUpdateSharedAccounts: new Subject<void>(),
   connected: new ReplaySubject<boolean>(1),
   requestItems: new BehaviorSubject<RequestItem[]>([]),
   onCancelRequestItem: new Subject<string>(),

diff --git a/packages/dapp-toolkit/src/modules/connect-button/types.ts b/packages/dapp-toolkit/src/modules/connect-button/types.ts
@@ -19,7 +19,7 @@ export type ConnectButtonModuleOutput = {
   status$: Observable<RadixButtonStatus>
   onConnect$: Observable<{ challenge: string } | undefined>
   onDisconnect$: Observable<void>
-  onUpdateSharedData$: Observable<void>
+  onUpdateSharedAccounts$: Observable<void>
   onShowPopover$: Observable<void>
   onCancelRequestItem$: Observable<string>
   onLinkClick$: Observable<{

diff --git a/packages/dapp-toolkit/src/modules/wallet-request/data-request/transformations/shared-data.ts b/packages/dapp-toolkit/src/modules/wallet-request/data-request/transformations/shared-data.ts
@@ -49,11 +49,13 @@ export const transformSharedDataToDataRequestState = (
           sharedData.ongoingPersonaData.numberOfRequestedPhoneNumbers,
         emailAddresses:
           sharedData.ongoingPersonaData.numberOfRequestedEmailAddresses,
-        reset: true,
+        reset: false,
       }
     }
 
     if (sharedData.persona) {
-      draft.persona = { withProof: !!sharedData.persona.proof }
+      draft.persona = {
+        withProof: false,
+      }
     }
   })
diff --git a/packages/dapp-toolkit/src/modules/wallet-request/wallet-request.ts b/packages/dapp-toolkit/src/modules/wallet-request/wallet-request.ts
@@ -416,7 +416,7 @@ export const WalletRequestModule = (input: {
     }
   }
 
-  const updateSharedData = () =>
+  const updateSharedAccounts = () =>
     stateModule
       .getState()
       .mapErr((err) => {
@@ -645,7 +645,7 @@ export const WalletRequestModule = (input: {
     setRequestDataState,
     getPendingRequests,
     getTransport,
-    updateSharedData,
+    updateSharedAccounts,
     dataRequestStateModule,
     interactionStatusChange$: interactionStatusChangeSubject.asObservable(),
     requestItems$: requestItemModule.requests$,

diff --git a/packages/dapp-toolkit/src/radix-dapp-toolkit.ts b/packages/dapp-toolkit/src/radix-dapp-toolkit.ts
@@ -117,7 +117,7 @@ export const RadixDappToolkit = (
       },
       provideConnectResponseCallback:
         walletRequestModule.provideConnectResponseCallback,
-      updateSharedData: () => walletRequestModule.updateSharedData(),
+      updateSharedAccounts: () => walletRequestModule.updateSharedAccounts(),
       sendOneTimeRequest: walletRequestModule.sendOneTimeRequest,
       sendTransaction: (input: SendTransactionInput) =>
         walletRequestModule.sendTransaction(input),