feat: extend the time we resume the session without showing OTP

app/core/SDKConnect/SDKConnect.ts

@@ -2,7 +2,6 @@ import { StackNavigationProp } from '@react-navigation/stack';
 import BackgroundTimer from 'react-native-background-timer';
 import DefaultPreference from 'react-native-default-preference';
 import AppConstants from '../AppConstants';
-
 import {
   TransactionController,
   WalletDevice,
@@ -53,7 +52,6 @@ import {
   waitForEmptyRPCQueue,
   waitForKeychainUnlocked,
 } from './utils/wait.util';
-
 import { Json } from '@metamask/controller-utils';
 import { PROTOCOLS } from '../../constants/deeplinks';
 import { Minimizer } from '../NativeModules';
@@ -84,6 +82,7 @@ export interface ConnectionProps {
   initialConnection?: boolean;
   originatorInfo?: OriginatorInfo;
   validUntil: number;
+  lastAuthorized: number; // timestamp of last received activity
 }
 export interface ConnectedSessions {
   [id: string]: Connection;
@@ -152,6 +151,11 @@ export class Connection extends EventEmitter2 {
   isResumed = false;
   initialConnection: boolean;
 
+  /*
+   * Timestamp of last activity, used to check if channel is still active and to prevent showing OTP approval modal too often.
+   */
+  lastAuthorized: number;
+
   /**
    * Prevent double sending 'authorized' message.
    */
@@ -191,6 +195,7 @@ export class Connection extends EventEmitter2 {
     rpcQueueManager,
     originatorInfo,
     approveHost,
+    lastAuthorized,
     getApprovedHosts,
     disapprove,
     revalidate,
@@ -213,6 +218,7 @@ export class Connection extends EventEmitter2 {
     super();
     this.origin = origin;
     this.channelId = id;
+    this.lastAuthorized = lastAuthorized;
     this.reconnect = reconnect || false;
     this.isResumed = false;
     this.originatorInfo = originatorInfo;
@@ -324,30 +330,49 @@ export class Connection extends EventEmitter2 {
           !this.initialConnection &&
           this.origin === AppConstants.DEEPLINKS.ORIGIN_QR_CODE
         ) {
-          if (approvalController.get(this.channelId)) {
-            // cleaning previous pending approval
-            approvalController.reject(
-              this.channelId,
-              ethErrors.provider.userRejectedRequest(),
-            );
-          }
-          this.approvalPromise = undefined;
+          const currentTime = Date.now();
+          const channelWasActiveRecently =
+            !!this.lastAuthorized &&
+            currentTime - this.lastAuthorized < HOUR_IN_MS;
 
-          if (!this.otps) {
-            this.otps = generateOTP();
-          }
-          this.sendMessage({
-            type: MessageType.OTP,
-            otpAnswer: this.otps?.[0],
-          }).catch((err) => {
-            Logger.log(err, `SDKConnect:: Connection failed to send otp`);
-          });
-          // Prevent auto approval if metamask is killed and restarted
-          disapprove(this.channelId);
+          if (channelWasActiveRecently) {
+            this.approvalPromise = undefined;
 
-          // Always need to re-approve connection first.
-          await this.checkPermissions();
-          this.sendAuthorized(true);
+            // Prevent auto approval if metamask is killed and restarted
+            disapprove(this.channelId);
+
+            // Always need to re-approve connection first.
+            await this.checkPermissions({
+              lastAuthorized: this.lastAuthorized,
+            });
+
+            this.sendAuthorized(true);
+          } else {
+            if (approvalController.get(this.channelId)) {
+              // cleaning previous pending approval
+              approvalController.reject(
+                this.channelId,
+                ethErrors.provider.userRejectedRequest(),
+              );
+            }
+            this.approvalPromise = undefined;
+
+            if (!this.otps) {
+              this.otps = generateOTP();
+            }
+            this.sendMessage({
+              type: MessageType.OTP,
+              otpAnswer: this.otps?.[0],
+            }).catch((err) => {
+              Logger.log(err, `SDKConnect:: Connection failed to send otp`);
+            });
+            // Prevent auto approval if metamask is killed and restarted
+            disapprove(this.channelId);
+
+            // Always need to re-approve connection first.
+            await this.checkPermissions();
+            this.sendAuthorized(true);
+          }
         } else if (
           !this.initialConnection &&
           this.origin === AppConstants.DEEPLINKS.ORIGIN_DEEPLINK
@@ -424,7 +449,7 @@ export class Connection extends EventEmitter2 {
         // Wait for bridge to be ready before handling messages.
         // It will wait until user accept/reject the connection request.
         try {
-          await this.checkPermissions(message);
+          await this.checkPermissions({ message });
           if (!this.receivedDisconnect) {
             await waitForConnectionReadiness({ connection: this });
             this.sendAuthorized();
@@ -630,9 +655,17 @@ export class Connection extends EventEmitter2 {
    * @returns {boolean} true when host is approved or user approved the request.
    * @throws error if the user reject approval request.
    */
-  private async checkPermissions(
-    _message?: CommunicationLayerMessage,
-  ): Promise<boolean> {
+  private async checkPermissions({
+    // eslint-disable-next-line
+    message,
+    lastAuthorized,
+  }: {
+    message?: CommunicationLayerMessage;
+    lastAuthorized?: number;
+  } = {}): Promise<boolean> {
+    const channelWasActiveRecently =
+      !!lastAuthorized && Date.now() - lastAuthorized < HOUR_IN_MS;
+
     // only ask approval if needed
     const approved = this.isApproved({
       channelId: this.channelId,
@@ -663,6 +696,10 @@ export class Connection extends EventEmitter2 {
       this.revalidate({ channelId: this.channelId });
     }
 
+    if (channelWasActiveRecently) {
+      return true;
+    }
+
     const approvalRequest = {
       origin: this.origin,
       type: ApprovalTypes.CONNECT_ACCOUNTS,
@@ -825,6 +862,7 @@ export class SDKConnect extends EventEmitter2 {
       otherPublicKey,
       origin,
       validUntil: Date.now() + DEFAULT_SESSION_TIMEOUT_MS,
+      lastAuthorized: Date.now(),
     };
 
     const initialConnection = this.approvedHosts[id] === undefined;
@@ -1251,11 +1289,15 @@ export class SDKConnect extends EventEmitter2 {
   }
 
   private _approveHost({ host }: approveHostProps) {
+    const channelId = host.replace(AppConstants.MM_SDK.SDK_REMOTE_ORIGIN, '');
     if (this.disabledHosts[host]) {
       // Might be useful for future feature.
     } else {
       // Host is approved for 24h.
       this.approvedHosts[host] = Date.now() + DAY_IN_MS;
+      if (this.connections[channelId]) {
+        this.connections[channelId].lastAuthorized = Date.now();
+      }
       // Prevent disabled hosts from being persisted.
       DefaultPreference.set(
         AppConstants.MM_SDK.SDK_APPROVEDHOSTS,