fix(polyfill/vendetta): pass the right Button component

bunny-mod · Jun 2, 2024 · 8a4d5fc · 8a4d5fc
1 parent 5a5639c
commit 8a4d5fc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/core/polyfills/vendettaObject.tsx b/src/core/polyfills/vendettaObject.tsx
@@ -142,8 +142,8 @@ export const initVendettaObject = (): any => {
             components: {
                 Forms,
                 General: common.ReactNative,
-                Alert: commonComponents.Alert,
-                Button: commonComponents.Button,
+                Alert: commonComponents.LegacyAlert,
+                Button: commonComponents.CompatButton,
                 HelpMessage: (...props: any[]) => <commonComponents.HelpMessage {...props} />,
                 SafeAreaView: (...props: any[]) => <commonComponents.SafeAreaView {...props} />,
                 Summary: components.Summary,

diff --git a/src/lib/ui/components/InputAlert.tsx b/src/lib/ui/components/InputAlert.tsx
@@ -1,5 +1,5 @@
 import { ButtonColors } from "@lib/utils/types";
-import { Alert, LegacyFormInput } from "@metro/common/components";
+import { LegacyAlert, LegacyFormInput } from "@metro/common/components";
 import { findByPropsProxy } from "@metro/utils";
 
 const Alerts = findByPropsProxy("openLazy", "close");
@@ -30,7 +30,7 @@ export default function InputAlert({ title, confirmText, confirmColor, onConfirm
     }
 
     return (
-        <Alert
+        <LegacyAlert
             title={title}
             confirmText={confirmText}
             confirmColor={confirmColor}
@@ -54,6 +54,6 @@ export default function InputAlert({ title, confirmText, confirmColor, onConfirm
                 showBorder={true}
                 style={{ alignSelf: "stretch" }}
             />
-        </Alert>
+        </LegacyAlert>
     );
 }
diff --git a/src/metro/common/components.ts b/src/metro/common/components.ts
@@ -14,9 +14,10 @@ const findSingular = (prop: string) => proxyLazy(() => findExports(bySingularPro
 const findProp = (prop: string) => proxyLazy(() => findByProps(prop)[prop]);
 
 // Discord
-export const Alert = findByDisplayNameProxy("FluxContainer(Alert)");
+export const LegacyAlert = findByDisplayNameProxy("FluxContainer(Alert)");
 export const CompatButton = findByPropsProxy("Looks", "Colors", "Sizes");
 export const HelpMessage = findByNameProxy("HelpMessage");
+
 // React Native's included SafeAreaView only adds padding on iOS.
 export const SafeAreaView = proxyLazy(() => findByProps("useSafeAreaInsets").SafeAreaView);