Merge branch 'main' into feat/non-evm-networks

MetaMask · Feb 24, 2025 · 1cac33f · 1cac33f
2 parents dc03b49 + 3d1e941
commit 1cac33f
Show file tree

Hide file tree

Showing 41 changed files with 203 additions and 338 deletions.
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/100.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/100.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/1024 1.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/1024 1.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/1024.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/1024.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/114 1.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/114 1.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/114.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/114.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/120 1.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/120 1.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/120 2.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/120 2.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/120 3.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/120 3.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/120.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/120.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/128 1.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/128 1.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/128.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/128.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/136 1.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/136 1.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/136.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/136.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/144.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/144.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/152 1.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/152 1.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/152.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/152.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/167 1.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/167 1.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/167.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/167.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/180 1.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/180 1.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/180.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/180.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/192 1.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/192 1.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/192.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/192.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/20.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/20.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/29.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/29.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/40 1.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/40 1.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/40.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/40.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/50.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/50.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/57.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/57.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/58 1.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/58 1.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/58.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/58.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/60 1.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/60 1.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/60.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/60.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/72.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/72.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/76 1.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/76 1.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/76.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/76.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/80 1.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/80 1.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/80.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/80.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/87 1.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/87 1.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/87.png b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/87.png
diff --git a/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/MetaMask/Images.xcassets/AppIcon.appiconset/Contents.json
diff --git a/ios/MetaMask/Info.plist b/ios/MetaMask/Info.plist
@@ -12,19 +12,6 @@
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIconName</key>
     <string>AppIcon</string>
-	<key>CFBundleIcons</key>
-	<dict>
-		<key>CFBundlePrimaryIcon</key>
-		<dict>
-			<key>CFBundleIconFiles</key>
-			<array>
-				<string>120</string>
-				<string>180</string>
-			</array>
-			<key>CFBundleIconName</key>
-			<string>AppIcon</string>
-		</dict>
-	</dict>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>