fix

goat-community · Sep 23, 2024 · be196e5 · be196e5
1 parent 02efbf0
commit be196e5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 27 deletions.
diff --git a/apps/web/app/[lng]/(dashboard)/settings/account/preferences/page.tsx b/apps/web/app/[lng]/(dashboard)/settings/account/preferences/page.tsx
@@ -39,8 +39,6 @@ const AccountPreferences = ({ params: { lng } }) => {
 
   const { changeColorMode } = useContext(ColorModeContext);
   const themeModes = ["dark", "light"] as const;
-  // const units = ["metric", "imperial"] as const;
-
   const {
     register: registerSystemSettings,
     handleSubmit: handleSystemSettingsSubmit,
@@ -103,6 +101,7 @@ const AccountPreferences = ({ params: { lng } }) => {
                 <Link
                   sx={{ p: 2, width: "100%" }}
                   component={NextLink}
+                  locale={lng}
                   href={`/${lng}/settings/account/preferences`}
                   style={{ textDecoration: "none", color: "inherit" }}>
                   {t(lng)}
@@ -134,27 +133,6 @@ const AccountPreferences = ({ params: { lng } }) => {
               </MenuItem>
             ))}
           </TextField>
-          {/* <TextField
-            select
-            defaultValue="metric"
-            label={t("measurement_unit")}
-            size="medium"
-            disabled={isBusy}
-            {...registerSystemSettings("unit")}
-            InputProps={{
-              startAdornment: (
-                <InputAdornment position="start">
-                  <Icon iconName={ICON_NAME.RULES_COMBINED} fontSize="small" />
-                </InputAdornment>
-              ),
-            }}
-          >
-            {units.map((unit) => (
-              <MenuItem key={unit} value={unit}>
-                {t(unit)}
-              </MenuItem>
-            ))}
-          </TextField> */}
         </Stack>
       </Box>
     </Box>

diff --git a/apps/web/app/[lng]/(dashboard)/settings/layout.tsx b/apps/web/app/[lng]/(dashboard)/settings/layout.tsx
@@ -35,7 +35,7 @@ const SettingsLayout = (props: SettingsLayoutProps) => {
   const pathname = usePathname();
   const theme = useTheme();
   const { userProfile, isLoading: isUserProfileLoading } = useUserProfile();
-  const { t } = useTranslation("common");
+  const { t, i18n } = useTranslation("common");
 
   const navigation = useMemo(
     () => [
@@ -106,6 +106,7 @@ const SettingsLayout = (props: SettingsLayoutProps) => {
                       key={item.icon}
                       href={item.link}
                       component={NextLink}
+                      locale={i18n.language || "en"}
                       passHref
                       style={{ textDecoration: "none" }}>
                       <ListItem

diff --git a/apps/web/components/dashboard/Sidebar.tsx b/apps/web/components/dashboard/Sidebar.tsx
@@ -45,8 +45,7 @@ const DashboardSidebar = (props: Props) => {
   const theme = useTheme();
   const pathname = usePathname();
 
-  const { t } = useTranslation("common");
-
+  const { t, i18n } = useTranslation("common");
   const MobileDrawerProps = {
     open: navVisible,
     onOpen: () => setNavVisible(true),
@@ -132,6 +131,7 @@ const DashboardSidebar = (props: Props) => {
             href={item.link}
             component={NextLink}
             passHref
+            locale={i18n.language || "en"}
             style={{ textDecoration: "none" }}>
             <ListItem
               disablePadding

diff --git a/apps/web/components/dashboard/settings/MembersTable.tsx b/apps/web/components/dashboard/settings/MembersTable.tsx
@@ -206,7 +206,8 @@ const MembersTable = ({
                       color="secondary"
                       disabled={
                         viewOnly ||
-                        row["roles"].includes(organizationRolesEnum.Enum["organization-owner"] || isBusy)
+                        row["roles"].includes(organizationRolesEnum.Enum["organization-owner"]) ||
+                        isBusy
                       }
                       onClick={(event) => handleClick(event, row.id)}
                       endIcon={

diff --git a/apps/web/middlewares/withSubscription.ts b/apps/web/middlewares/withSubscription.ts