Merge branch 'canary-patch' into patch

Author: surajahmed

src/components/primitives/Text/index.tsx

@@ -60,12 +60,12 @@ const Text = ({ children, ...props }: ITextProps, ref: any) => {
   if (resolvedFontFamily) {
     fontFamily = resolvedFontFamily;
   }
-
   // Need to apply fontWeight & fontStyle on web
   if (Platform.OS === 'web') {
     if (resolvedFontFamily) {
-      fontFamily = resolvedFontFamily;
+      fontFamily = resolvedFontFamily.fontFamily;
     }
+
     resolvedFontFamily = {
       fontFamily,
       fontWeight: fontWeight ?? (hasTextAncestor ? undefined : 400),