Skip to content

Commit 51e5f8e

Browse files
salimtbsalimtb
committed
fix: fix patch
1 parent c984ffb commit 51e5f8e

File tree

2 files changed

+17
-180
lines changed

2 files changed

+17
-180
lines changed

‎app/components/Nav/App/index.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -711,10 +711,6 @@ const App = (props) => {
711711
component={MultiRpcModal}
712712
/>
713713
) : null}
714-
<Stack.Screen
715-
name={Routes.MODAL.MULTI_RPC_MIGRATION_MODAL}
716-
component={MultiRpcModal}
717-
/>
718714
<Stack.Screen
719715
name={Routes.SHEET.SHOW_TOKEN_ID}
720716
component={ShowTokenIdSheet}

‎patches/@metamask+preferences-controller+11.0.0.patch‎

Lines changed: 17 additions & 176 deletions
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,3 @@
1-
diff --git a/node_modules/@metamask/preferences-controller/.idea/.gitignore b/node_modules/@metamask/preferences-controller/.idea/.gitignore
2-
new file mode 100644
3-
index 0000000..b58b603
4-
--- /dev/null
5-
+++ b/node_modules/@metamask/preferences-controller/.idea/.gitignore
6-
@@ -0,0 +1,5 @@
7-
+# Default ignored files
8-
+/shelf/
9-
+/workspace.xml
10-
+# Editor-based HTTP Client requests
11-
+/httpRequests/
12-
diff --git a/node_modules/@metamask/preferences-controller/.idea/modules.xml b/node_modules/@metamask/preferences-controller/.idea/modules.xml
13-
new file mode 100644
14-
index 0000000..ecac035
15-
--- /dev/null
16-
+++ b/node_modules/@metamask/preferences-controller/.idea/modules.xml
17-
@@ -0,0 +1,8 @@
18-
+<?xml version="1.0" encoding="UTF-8"?>
19-
+<project version="4">
20-
+ <component name="ProjectModuleManager">
21-
+ <modules>
22-
+ <module fileurl="file://$PROJECT_DIR$/.idea/preferences-controller.iml" filepath="$PROJECT_DIR$/.idea/preferences-controller.iml" />
23-
+ </modules>
24-
+ </component>
25-
+</project>
26-
\ No newline at end of file
27-
diff --git a/node_modules/@metamask/preferences-controller/.idea/preferences-controller.iml b/node_modules/@metamask/preferences-controller/.idea/preferences-controller.iml
28-
new file mode 100644
29-
index 0000000..24643cc
30-
--- /dev/null
31-
+++ b/node_modules/@metamask/preferences-controller/.idea/preferences-controller.iml
32-
@@ -0,0 +1,12 @@
33-
+<?xml version="1.0" encoding="UTF-8"?>
34-
+<module type="WEB_MODULE" version="4">
35-
+ <component name="NewModuleRootManager">
36-
+ <content url="file://$MODULE_DIR$">
37-
+ <excludeFolder url="file://$MODULE_DIR$/.tmp" />
38-
+ <excludeFolder url="file://$MODULE_DIR$/temp" />
39-
+ <excludeFolder url="file://$MODULE_DIR$/tmp" />
40-
+ </content>
41-
+ <orderEntry type="inheritedJdk" />
42-
+ <orderEntry type="sourceFolder" forTests="false" />
43-
+ </component>
44-
+</module>
45-
\ No newline at end of file
46-
diff --git a/node_modules/@metamask/preferences-controller/.idea/workspace.xml b/node_modules/@metamask/preferences-controller/.idea/workspace.xml
47-
new file mode 100644
48-
index 0000000..dbf94fd
49-
--- /dev/null
50-
+++ b/node_modules/@metamask/preferences-controller/.idea/workspace.xml
51-
@@ -0,0 +1,50 @@
52-
+<?xml version="1.0" encoding="UTF-8"?>
53-
+<project version="4">
54-
+ <component name="ChangeListManager">
55-
+ <list default="true" id="605ad92a-3a3b-409b-aace-8d3cf5420af6" name="Changes" comment="" />
56-
+ <option name="SHOW_DIALOG" value="false" />
57-
+ <option name="HIGHLIGHT_CONFLICTS" value="true" />
58-
+ <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
59-
+ <option name="LAST_RESOLUTION" value="IGNORE" />
60-
+ </component>
61-
+ <component name="ProjectColorInfo"><![CDATA[{
62-
+ "customColor": "",
63-
+ "associatedIndex": 6
64-
+}]]></component>
65-
+ <component name="ProjectId" id="2mZDhfDgVzYvTMobnnTEx2OWDXx" />
66-
+ <component name="ProjectViewState">
67-
+ <option name="autoscrollToSource" value="true" />
68-
+ <option name="hideEmptyMiddlePackages" value="true" />
69-
+ <option name="showLibraryContents" value="true" />
70-
+ </component>
71-
+ <component name="PropertiesComponent"><![CDATA[{
72-
+ "keyToString": {
73-
+ "RunOnceActivity.ShowReadmeOnStart": "true",
74-
+ "nodejs_package_manager_path": "npm",
75-
+ "ts.external.directory.path": "/Users/salim/Applications/JetBrains Toolbox/IntelliJ IDEA Ultimate.app/WebStorm.app/Contents/plugins/javascript-plugin/jsLanguageServicesImpl/external",
76-
+ "vue.rearranger.settings.migration": "true"
77-
+ }
78-
+}]]></component>
79-
+ <component name="SharedIndexes">
80-
+ <attachedChunks>
81-
+ <set>
82-
+ <option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-WS-241.17011.90" />
83-
+ </set>
84-
+ </attachedChunks>
85-
+ </component>
86-
+ <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
87-
+ <component name="TaskManager">
88-
+ <task active="true" id="Default" summary="Default task">
89-
+ <changelist id="605ad92a-3a3b-409b-aace-8d3cf5420af6" name="Changes" comment="" />
90-
+ <created>1727275325414</created>
91-
+ <option name="number" value="Default" />
92-
+ <option name="presentableId" value="Default" />
93-
+ <updated>1727275325414</updated>
94-
+ <workItem from="1727275327335" duration="201000" />
95-
+ </task>
96-
+ <servers />
97-
+ </component>
98-
+ <component name="TypeScriptGeneratedFilesManager">
99-
+ <option name="version" value="3" />
100-
+ </component>
101-
+</project>
102-
\ No newline at end of file
1031
diff --git a/node_modules/@metamask/preferences-controller/dist/chunk-FSWGV6H6.js b/node_modules/@metamask/preferences-controller/dist/chunk-FSWGV6H6.js
1042
index 30e985c..d03fa2f 100644
1053
--- a/node_modules/@metamask/preferences-controller/dist/chunk-FSWGV6H6.js
@@ -122,8 +20,7 @@ index 30e985c..d03fa2f 100644
12220
+ useTransactionSimulations: { persist: true, anonymous: true },
12321
+ showMultiRpcModal: { persist: false, anonymous: false },
12422
};
125-
-var name = "PreferencesController";
126-
+var name = 'PreferencesController';
23+
var name = "PreferencesController";
12724
function getDefaultPreferencesState() {
12825
@@ -37,7 +41,7 @@ function getDefaultPreferencesState() {
12926
isIpfsGatewayEnabled: true,
@@ -132,8 +29,7 @@ index 30e985c..d03fa2f 100644
13229
- openSeaEnabled: false,
13330
+ displayNftMedia: false,
13431
securityAlertsEnabled: false,
135-
- selectedAddress: "",
136-
+ selectedAddress: '',
32+
selectedAddress: "",
13733
showIncomingTransactions: {
13834
@@ -64,7 +68,11 @@ function getDefaultPreferencesState() {
13935
},
@@ -156,7 +52,7 @@ index 30e985c..d03fa2f 100644
15652
+ if (useNftDetection && !this.state.displayNftMedia) {
15753
throw new Error(
15854
- "useNftDetection cannot be enabled if openSeaEnabled is false"
159-
+ 'useNftDetection cannot be enabled if displayNftMedia is false',
55+
+ "useNftDetection cannot be enabled if displayNftMedia is false"
16056
);
16157
}
16258
this.update((state) => {
@@ -224,82 +120,25 @@ index 30e985c..d03fa2f 100644
224120
+ * @param smartTransactionsOptInStatus - true to opt into smart transactions
225121
+ */
226122
+ setSmartTransactionsOptInStatus(smartTransactionsOptInStatus) {
227-
+ this.update((state) => {
228-
+ state.smartTransactionsOptInStatus = smartTransactionsOptInStatus;
229-
+ });
123+
+ this.update((state) => {
124+
+ state.smartTransactionsOptInStatus = smartTransactionsOptInStatus;
125+
+ });
230126
+ }
231127
+
232128
+ /**
233-
+ * A setter for the user to opt into transaction simulations
234-
+ *
235-
+ * @param useTransactionSimulations - true to opt into transaction simulations
236-
+ */
129+
+ * A setter for the user to opt into transaction simulations
130+
+ *
131+
+ * @param useTransactionSimulations - true to opt into transaction simulations
132+
+ */
237133
+ setUseTransactionSimulations(useTransactionSimulations) {
238-
+ this.update((state) => {
239-
+ state.useTransactionSimulations = useTransactionSimulations;
240-
+ });
134+
+ this.update((state) => {
135+
+ state.useTransactionSimulations = useTransactionSimulations;
136+
+ });
241137
+ }
242138
+
243139
/**
244140
* A setter for the user preferences to enable/disable rpc methods.
245141
*
246-
@@ -255,7 +312,7 @@ var PreferencesController = class extends _basecontroller.BaseController {
247-
const { disabledRpcMethodPreferences } = this.state;
248-
const newDisabledRpcMethods = {
249-
...disabledRpcMethodPreferences,
250-
- [methodName]: isEnabled
251-
+ [methodName]: isEnabled,
252-
};
253-
this.update((state) => {
254-
state.disabledRpcMethodPreferences = newDisabledRpcMethods;
255-
@@ -297,21 +354,28 @@ var PreferencesController = class extends _basecontroller.BaseController {
256-
* @param chainId - On hexadecimal format to enable the incoming transaction network
257-
* @param isIncomingTransactionNetworkEnable - true to enable incoming transactions
258-
*/
259-
- setEnableNetworkIncomingTransactions(chainId, isIncomingTransactionNetworkEnable) {
260-
- if (Object.values(_chunkPOA2PUW4js.ETHERSCAN_SUPPORTED_CHAIN_IDS).includes(chainId)) {
261-
+ setEnableNetworkIncomingTransactions(
262-
+ chainId,
263-
+ isIncomingTransactionNetworkEnable,
264-
+ ) {
265-
+ if (
266-
+ Object.values(_chunkPOA2PUW4js.ETHERSCAN_SUPPORTED_CHAIN_IDS).includes(
267-
+ chainId,
268-
+ )
269-
+ ) {
270-
this.update((state) => {
271-
state.showIncomingTransactions = {
272-
...this.state.showIncomingTransactions,
273-
- [chainId]: isIncomingTransactionNetworkEnable
274-
+ [chainId]: isIncomingTransactionNetworkEnable,
275-
};
276-
});
277-
}
278-
}
279-
};
280-
_syncIdentities = new WeakSet();
281-
-syncIdentities_fn = function(addresses) {
282-
- addresses = addresses.map(
283-
- (address) => _controllerutils.toChecksumHexAddress.call(void 0, address)
284-
+syncIdentities_fn = function (addresses) {
285-
+ addresses = addresses.map((address) =>
286-
+ _controllerutils.toChecksumHexAddress.call(void 0, address),
287-
);
288-
this.update((state) => {
289-
const { identities } = state;
290-
@@ -335,9 +399,7 @@ syncIdentities_fn = function(addresses) {
291-
};
292-
var PreferencesController_default = PreferencesController;
293-
294-
-
295-
-
296-
-
297-
-
298-
-exports.getDefaultPreferencesState = getDefaultPreferencesState; exports.PreferencesController = PreferencesController; exports.PreferencesController_default = PreferencesController_default;
299-
+exports.getDefaultPreferencesState = getDefaultPreferencesState;
300-
+exports.PreferencesController = PreferencesController;
301-
+exports.PreferencesController_default = PreferencesController_default;
302-
//# sourceMappingURL=chunk-FSWGV6H6.js.map
303142
diff --git a/node_modules/@metamask/preferences-controller/dist/types/PreferencesController.d.ts b/node_modules/@metamask/preferences-controller/dist/types/PreferencesController.d.ts
304143
index 7e3ba15..c3c7ec6 100644
305144
--- a/node_modules/@metamask/preferences-controller/dist/types/PreferencesController.d.ts
@@ -360,9 +199,11 @@ index 7e3ba15..c3c7ec6 100644
360199
setUseNftDetection(useNftDetection: boolean): void;
361200
/**
362201
- * Toggle the opensea enabled setting.
363-
- *
202+
+ * Toggle the display nft media enabled setting.
203+
*
364204
- * @param openSeaEnabled - Boolean indicating user preference on using OpenSea's API.
365-
- */
205+
+ * @param displayNftMedia - Boolean indicating user preference on using web2 third parties.
206+
*/
366207
- setOpenSeaEnabled(openSeaEnabled: boolean): void;
367208
+ setDisplayNftMedia(displayNftMedia: boolean): void;
368209
+ /**

0 commit comments

Comments
 (0)