Small adjustments

Author: IKarbowiak

src/auth/views/Login.tsx

@@ -52,7 +52,9 @@ const LoginView = ({ params }: LoginViewProps) => {
         fetchPolicy: "network-only",
       },
     );
-  const externalAuthentications = externalAuthenticationsStaging ?? externalAuthenticationsMain;
+  const externalAuthentications = isStagingSchema()
+    ? externalAuthenticationsStaging
+    : externalAuthenticationsMain;
   const externalAuthenticationsLoading =
     externalAuthenticationsLoadingMain || externalAuthenticationsLoadingStaging;
 

src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx

@@ -213,20 +213,24 @@ const SiteSettingsPage = (props: SiteSettingsPageProps) => {
                   </DashboardCard>
                 </Box>
 
-                <Divider />
+                {isStagingSchema() && (
+                  <>
+                    <Divider />
 
-                <Box
-                  display="grid"
-                  __gridTemplateColumns="1fr 3fr"
-                  paddingLeft={6}
-                  paddingBottom={8}
-                >
-                  <PageSectionHeader
-                    title={intl.formatMessage(messages.sectionPasswordLoginTitle)}
-                    description={intl.formatMessage(messages.sectionPasswordLoginDescription)}
-                  />
-                  <SitePasswordLoginCard value={data.passwordLoginMode} onChange={change} />
-                </Box>
+                    <Box
+                      display="grid"
+                      __gridTemplateColumns="1fr 3fr"
+                      paddingLeft={6}
+                      paddingBottom={8}
+                    >
+                      <PageSectionHeader
+                        title={intl.formatMessage(messages.sectionPasswordLoginTitle)}
+                        description={intl.formatMessage(messages.sectionPasswordLoginDescription)}
+                      />
+                      <SitePasswordLoginCard value={data.passwordLoginMode} onChange={change} />
+                    </Box>
+                  </>
+                )}
 
                 <Divider />
 

src/siteSettings/views/index.tsx

@@ -31,7 +31,7 @@ const SiteSettings = () => {
     displayLoader: true,
     skip: isMainSchema(),
   });
-  const siteSettings = siteSettingsStaging ?? siteSettingsMain;
+  const siteSettings = isStagingSchema() ? siteSettingsStaging : siteSettingsMain;
 
   const onUpdateCompleted = (data: {
     shopSettingsUpdate?: { errors: unknown[] } | null;
@@ -58,6 +58,8 @@ const SiteSettings = () => {
 
   const updateOpts = isStagingSchema() ? updateShopSettingsOptsStaging : updateShopSettingsOpts;
 
+  // Staging schema errors have a superset of ShopErrorCode values,
+  // but they share the same shape (code, field, message) used by UI components.
   const errors = [
     ...(updateOpts.data?.shopSettingsUpdate?.errors || []),
     ...(updateOpts.data?.shopAddressUpdate?.errors || []),