From 0cc312d319ccacd86a907dfa51e36a066d01af3e Mon Sep 17 00:00:00 2001
From: iGroza <xneonxneon1@gmail.com>
Date: Thu, 2 May 2024 19:37:03 +0700
Subject: [PATCH] fix(HQM-419): encrypted_data_not_found

---
 .../HomeStack/SettingsStack/settings-test.tsx | 44 ++++++++++++++++---
 src/screens/settings-developer-tools.tsx      | 18 +++++++-
 .../json-rpc-methods-handlers.ts              |  6 ++-
 src/services/sign-json-rpc-request.ts         |  6 ++-
 4 files changed, 64 insertions(+), 10 deletions(-)

diff --git a/src/screens/HomeStack/SettingsStack/settings-test.tsx b/src/screens/HomeStack/SettingsStack/settings-test.tsx
index 07aa756f1..fc94aec82 100644
--- a/src/screens/HomeStack/SettingsStack/settings-test.tsx
+++ b/src/screens/HomeStack/SettingsStack/settings-test.tsx
@@ -32,6 +32,7 @@ import {
 import {AddressUtils} from '@app/helpers/address-utils';
 import {awaitForCaptcha} from '@app/helpers/await-for-captcha';
 import {awaitForJsonRpcSign} from '@app/helpers/await-for-json-rpc-sign';
+import {awaitForProvider} from '@app/helpers/await-for-provider';
 import {
   QRScannerTypeEnum,
   awaitForScanQr,
@@ -577,7 +578,7 @@ export const SettingsTestScreen = observer(() => {
               Clipboard.setString(pushToken);
               toastMessage('Copied to clipboard');
             }}>
-            {uid}
+            {pushToken}
           </Text>
           <Spacer height={8} />
         </>
@@ -696,7 +697,8 @@ export const SettingsTestScreen = observer(() => {
       <Input
         placeholder="{ method: 'eth_sendTransactrion', params: [...] }"
         value={rawSignData}
-        error={!isValidRawSignData}
+        error={!!rawSignData && !isValidRawSignData}
+        multiline
         onChangeText={data => {
           setRawSignData(data);
           try {
@@ -711,15 +713,43 @@ export const SettingsTestScreen = observer(() => {
       <Button
         title="sign request"
         disabled={!isValidRawSignData}
-        onPress={() => {
-          awaitForJsonRpcSign({
-            metadata: HAQQ_METADATA,
-            request: signData!,
-          });
+        onPress={async () => {
+          try {
+            const address = await awaitForWallet({
+              title: I18N.selectAccount,
+              wallets: Wallet.getAllVisible(),
+            });
+            const providers = Provider.getAll();
+            const initialProviderId = app.provider.id;
+            const providerId = await awaitForProvider({
+              providers,
+              initialProviderId: initialProviderId!,
+              title: I18N.networks,
+            });
+            const result = await awaitForJsonRpcSign({
+              metadata: HAQQ_METADATA,
+              request: signData!,
+              selectedAccount: address,
+              chainId: Provider.getById(providerId)?.ethChainId,
+            });
+            Alert.alert('Result', result, [
+              {text: 'Close'},
+              {text: 'Copy', onPress: () => Clipboard.setString(result)},
+            ]);
+          } catch (err) {
+            Alert.alert('error', JSON.stringify(err, null, 2));
+          }
         }}
         variant={ButtonVariant.contained}
       />
       <Spacer height={8} />
+      <Button
+        title="Clear"
+        disabled={!rawSignData}
+        onPress={() => setRawSignData('')}
+        variant={ButtonVariant.second}
+      />
+      <Spacer height={8} />
       <Title text="WalletConnect" />
       <Input
         placeholder="wc:"
diff --git a/src/screens/settings-developer-tools.tsx b/src/screens/settings-developer-tools.tsx
index 5acd0ddee..c2a20e6ad 100644
--- a/src/screens/settings-developer-tools.tsx
+++ b/src/screens/settings-developer-tools.tsx
@@ -197,7 +197,8 @@ export const SettingsDeveloperTools = observer(() => {
       <Input
         placeholder="{ method: 'eth_sendTransactrion', params: [...] }"
         value={rawSignData}
-        error={!isValidRawSignData}
+        error={!!rawSignData && !isValidRawSignData}
+        multiline
         onChangeText={data => {
           setRawSignData(data);
           try {
@@ -218,10 +219,18 @@ export const SettingsDeveloperTools = observer(() => {
               title: I18N.selectAccount,
               wallets: Wallet.getAllVisible(),
             });
+            const providers = Provider.getAll();
+            const initialProviderId = app.provider.id;
+            const providerId = await awaitForProvider({
+              providers,
+              initialProviderId: initialProviderId!,
+              title: I18N.networks,
+            });
             const result = await awaitForJsonRpcSign({
               metadata: HAQQ_METADATA,
               request: signData!,
               selectedAccount: address,
+              chainId: Provider.getById(providerId)?.ethChainId,
             });
             Alert.alert('Result', result, [
               {text: 'Close'},
@@ -234,6 +243,13 @@ export const SettingsDeveloperTools = observer(() => {
         variant={ButtonVariant.contained}
       />
       <Spacer height={8} />
+      <Button
+        title="Clear"
+        disabled={!rawSignData}
+        onPress={() => setRawSignData('')}
+        variant={ButtonVariant.second}
+      />
+      <Spacer height={8} />
       <Title text="WalletConnect" />
       <Input
         placeholder="wc:"
diff --git a/src/services/json-rpc-middleware/json-rpc-methods-handlers.ts b/src/services/json-rpc-middleware/json-rpc-methods-handlers.ts
index c7c64135d..908901f81 100644
--- a/src/services/json-rpc-middleware/json-rpc-methods-handlers.ts
+++ b/src/services/json-rpc-middleware/json-rpc-methods-handlers.ts
@@ -486,7 +486,11 @@ export const JsonRpcMethodsHandlers: Record<string, JsonRpcMethodHandler> = {
 
     const wallet = Wallet.getById(address);
     if (wallet) {
-      const walletProvider = await getProviderInstanceForWallet(wallet);
+      const walletProvider = await getProviderInstanceForWallet(
+        wallet,
+        false,
+        true,
+      );
       const {publicKey} = await walletProvider.getAccountInfo(wallet.path!);
 
       return {
diff --git a/src/services/sign-json-rpc-request.ts b/src/services/sign-json-rpc-request.ts
index 970babb7e..9c0ef7fac 100644
--- a/src/services/sign-json-rpc-request.ts
+++ b/src/services/sign-json-rpc-request.ts
@@ -99,7 +99,11 @@ export class SignJsonRpcRequest {
       throw new Error(getText(I18N.jsonRpcErrorInvalidWallet));
     }
 
-    const instanceProvider = await getProviderInstanceForWallet(wallet);
+    const instanceProvider = await getProviderInstanceForWallet(
+      wallet,
+      false,
+      true,
+    );
 
     if (!instanceProvider) {
       throw new Error(getText(I18N.jsonRpcErrorInvalidProvider));