Merge pull request #318 from AppQuality/profile-modal-notifications

fixed title translation
AppQuality · Feb 22, 2024 · d1883ee · d1883ee
2 parents 8345e4f + 95bd57a
commit d1883ee
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/src/stories/profile-modal/_types.tsx b/src/stories/profile-modal/_types.tsx
@@ -1,4 +1,4 @@
-import { InputHTMLAttributes, LiHTMLAttributes } from "react";
+import { LiHTMLAttributes } from "react";
 import { NextItemArgs } from "../dropdowns/menu/_types";
 import { ModalArgs } from "../modals/_types";
 

diff --git a/src/stories/profile-modal/components/previousMenuButton.tsx b/src/stories/profile-modal/components/previousMenuButton.tsx
@@ -8,6 +8,7 @@ const StyledButton = styled(Button)`
   font-weight: ${(props) => props.theme.fontWeights.semibold};
   padding-left: 0;
   justify-content: flex-start;
+  border-radius: 0;
 `;
 
 export const PreviousButton = (props: ButtonArgs) => (

diff --git a/src/stories/profile-modal/items/settingsMenuItem.tsx b/src/stories/profile-modal/items/settingsMenuItem.tsx
@@ -63,7 +63,7 @@ export const SettingsItem = (props: SettingsProps) => {
   const content = (
     <>
       <PreviousButton onClick={() => props.setActive("")} isBasic>
-        {props.i18n?.settingsTitle ?? "Notifications Settings"}
+        {props.i18n?.settingsTitle}
       </PreviousButton>
       <Separator />
       <StyledBody>
@@ -74,16 +74,16 @@ export const SettingsItem = (props: SettingsProps) => {
         )}
         <Field>
           <TriggerTitle isBold>
-            {props.i18n?.settingsToggle?.title ?? "Allow notifications"}
+            {props.i18n?.settingsToggle?.title}
           </TriggerTitle>
           <Toggle
             checked={value === 1}
             onChange={() => onToggleSettings(value === 1 ? 0 : 1)}
           >
             <Label>
               {value === 1
-                ? props.i18n?.settingsToggle?.on ?? "Yes"
-                : props.i18n?.settingsToggle?.off ?? "No"}
+                ? props.i18n?.settingsToggle?.on
+                : props.i18n?.settingsToggle?.off}
             </Label>
           </Toggle>
         </Field>
@@ -111,7 +111,7 @@ export const SettingsItem = (props: SettingsProps) => {
         setActive={props.setActive}
         icon={<GearIcon color={theme.palette.blue[600]} />}
       >
-        {props.title}
+        {props.i18n?.settingsTitle}
       </MenuItem>
     </>
   );

diff --git a/src/stories/profile-modal/userMenu.tsx b/src/stories/profile-modal/userMenu.tsx
@@ -66,9 +66,11 @@ export const UserMenu = (props: UserMenuArgs) => {
           value={"settings"}
           selectedItem={item}
           setActive={(i) => toggleItem(i)}
-          title={props.i18n?.settingsTitle || "Notifications Settings"}
           settingValue={props.settingValue}
+          title={props.i18n?.settingsTitle || "Notifications Settings"}
           i18n={{
+            settingsTitle:
+            props.i18n?.settingsTitle || "Notifications Settings",
             settingsIntroText: props.i18n?.settingsIntroText,
             settingsOutroText: props.i18n?.settingsOutroText,
             settingsToggle: props.i18n?.settingsToggle,