wip

ios/BlueWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,5 @@
 {
-  "originHash" : "89509f555bc90a15b96ca0a326a69850770bdaac04a46f9cf482d81533702e3c",
+  "originHash" : "52530e6b1e3a85c8854952ef703a6d1bbe1acd82713be2b3166476b9b277db23",
   "pins" : [
     {
       "identity" : "bugsnag-cocoa",
@@ -19,6 +19,15 @@
         "version" : "6.2.2"
       }
     },
+    {
+      "identity" : "keychain-swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/evgenyneu/keychain-swift.git",
+      "state" : {
+        "revision" : "5e1b02b6a9dac2a759a1d5dbc175c86bd192a608",
+        "version" : "24.0.0"
+      }
+    },
     {
       "identity" : "swift_qrcodejs",
       "kind" : "remoteSourceControl",

loc/en.json

@@ -254,14 +254,13 @@
     "electrum_settings_server": "Electrum Server",
     "electrum_status": "Status",
     "electrum_preferred_server": "Preferred Server",
-    "electrum_preferred_server_description": "Enter the server you want your wallet to use for all Bitcoin activities. Once set, your wallet will exclusively use this server to check balances, send transactions, and fetch network data. Ensure you trust this server before setting it.",    "electrum_clear_alert_title": "Clear history?",
+    "electrum_preferred_server_description": "Enter the server you want your wallet to use for all Bitcoin activities. Once set, your wallet will exclusively use this server to check balances, send transactions, and fetch network data. Ensure you trust this server before setting it.",
     "electrum_clear_alert_message": "Do you want to clear electrum servers history?",
     "electrum_clear_alert_cancel": "Cancel",
     "electrum_unable_to_connect": "Unable to connect to {server}.",
     "electrum_history": "History",
     "electrum_reset_to_default": "This will let BlueWallet randomly choose a server from the suggested list and history. Your server history will remain unchanged.",
     "electrum_reset": "Reset to default",
-    "electrum_clear": "Clear History",
     "encrypt_decrypt": "Decrypt Storage",
     "encrypt_decrypt_q": "Are you sure you want to decrypt your storage? This will allow your wallets to be accessed without a password.",
     "encrypt_enc_and_pass": "Encrypted and Password Protected",

loc/pcm.json

@@ -49,7 +49,6 @@
     "default_info": "Normal info",
     "default_title": "As you launch",
     "default_wallets": "See all your wallets",
-    "electrum_clear_alert_title": "You wan clear history?",
     "electrum_clear_alert_message": "You wan clear electrum servers history?",
     "electrum_clear_alert_cancel": "Cancel",
     "electrum_clear_alert_ok": "Ok",

screen/settings/ElectrumSettings.tsx

@@ -153,13 +153,6 @@ const ElectrumSettings: React.FC = () => {
     }
   }, [server]);
 
-  const clearHistory = useCallback(async () => {
-    setIsLoading(true);
-    await DefaultPreference.clear(BlueElectrum.ELECTRUM_SERVER_HISTORY);
-    setServerHistory(new Set());
-    setIsLoading(false);
-  }, []);
-
   const serverExists = useCallback(
     (value: ElectrumServerItem) => {
       return Array.from(serverHistory).some(s => `${s.host}:${s.tcp}:${s.ssl}` === `${value.host}:${value.tcp}:${value.ssl}`);
@@ -220,14 +213,6 @@ const ElectrumSettings: React.FC = () => {
     [save],
   );
 
-  const clearHistoryAlert = useCallback(() => {
-    triggerHapticFeedback(HapticFeedbackTypes.ImpactHeavy);
-    Alert.alert(loc.settings.electrum_clear_alert_title, loc.settings.electrum_clear_alert_message, [
-      { text: loc.settings.electrum_clear_alert_cancel, onPress: () => console.log('Cancel Pressed'), style: 'cancel' },
-      { text: loc._.ok, onPress: () => clearHistory() },
-    ]);
-  }, [clearHistory]);
-
   const presentSelectServerAlert = useCallback(
     (value: ElectrumServerItem) => {
       triggerHapticFeedback(HapticFeedbackTypes.ImpactHeavy);
@@ -299,9 +284,6 @@ const ElectrumSettings: React.FC = () => {
               }
             });
             break;
-          case CommonToolTipActions.ClearHistory.id:
-            clearHistoryAlert();
-            break;
           default:
             try {
               selectServer(id);
@@ -312,7 +294,7 @@ const ElectrumSettings: React.FC = () => {
         }
       }
     },
-    [presentSelectServerAlert, presentDeleteServerAlert, clearHistoryAlert, fetchData, selectServer],
+    [presentSelectServerAlert, presentDeleteServerAlert, fetchData, selectServer],
   );
 
   type TCreateServerActionParameters = {
@@ -404,7 +386,7 @@ const ElectrumSettings: React.FC = () => {
         id: 'server_history',
         text: loc.settings.electrum_history,
         displayInline: serverHistory.size <= 5 && serverHistory.size > 0,
-        subactions: [CommonToolTipActions.ClearHistory, ...serverSubactions],
+        subactions: serverSubactions,
         hidden: serverHistory.size === 0,
       });
     }

typings/CommonToolTipActions.ts

@@ -22,7 +22,6 @@ const keys = {
   ClearClipboard: 'clearClipboard',
   PaymentsCode: 'paymentsCode',
   ResetToDefault: 'resetToDefault',
-  ClearHistory: 'clearHistory',
   ScanQR: 'scan_qr',
   RemoveAllRecipients: 'RemoveAllRecipients',
   AddRecipient: 'AddRecipient',
@@ -78,9 +77,6 @@ const icons = {
   CoinControl: { iconValue: 'switch.2' },
   CoSignTransaction: { iconValue: 'signature' },
   PaymentsCode: { iconValue: 'qrcode.viewfinder' },
-  ClearHistory: {
-    iconValue: 'trash',
-  },
   RemoveAllRecipients: { iconValue: 'person.2.slash' },
   AddRecipient: { iconValue: 'person.badge.plus' },
   RemoveRecipient: { iconValue: 'person.badge.minus' },
@@ -327,12 +323,6 @@ export const CommonToolTipActions: Record<string, ToolTipAction> = {
     text: loc.settings.electrum_reset,
     hidden: false,
   },
-  ClearHistory: {
-    id: keys.ClearHistory,
-    text: loc.settings.electrum_clear,
-    icon: icons.ClearHistory,
-    destructive: true,
-  },
   PasteFromClipboard: {
     id: keys.PasteFromClipboard,
     text: loc.wallets.paste_from_clipboard,