File tree Expand file tree Collapse file tree 3 files changed +13
-8
lines changed Expand file tree Collapse file tree 3 files changed +13
-8
lines changed Original file line number Diff line number Diff line change @@ -26,17 +26,17 @@ const Header = () => {
26
26
const location = useLocation ( ) ;
27
27
const { permissions } = usePermissions ( ) ;
28
28
29
- let currentPath = '/' ;
30
- if ( ! ! matchPath ( '/contacts/*' , location . pathname ) ) {
29
+ let currentPath : string | boolean = '/' ;
30
+ if ( ! ! matchPath ( '/' , location . pathname ) ) {
31
+ currentPath = '/' ;
32
+ } else if ( ! ! matchPath ( '/contacts/*' , location . pathname ) ) {
31
33
currentPath = '/contacts' ;
32
34
} else if ( ! ! matchPath ( '/companies/*' , location . pathname ) ) {
33
35
currentPath = '/companies' ;
34
36
} else if ( ! ! matchPath ( '/deals/*' , location . pathname ) ) {
35
37
currentPath = '/deals' ;
36
- } else if ( ! ! matchPath ( '/settings' , location . pathname ) ) {
37
- currentPath = '/settings' ;
38
- } else if ( ! ! matchPath ( '/sales/*' , location . pathname ) ) {
39
- currentPath = '/sales' ;
38
+ } else {
39
+ currentPath = false ;
40
40
}
41
41
42
42
return (
Original file line number Diff line number Diff line change @@ -66,7 +66,12 @@ const defaultLightTheme = deepmerge(defaultTheme, {
66
66
} ,
67
67
} ) ;
68
68
69
- const i18nProvider = polyglotI18nProvider ( ( ) => englishMessages , 'en' ) ;
69
+ const i18nProvider = polyglotI18nProvider (
70
+ ( ) => englishMessages ,
71
+ 'en' ,
72
+ [ { locale : 'en' , name : 'English' } ] ,
73
+ { allowMissing : true }
74
+ ) ;
70
75
71
76
/**
72
77
* CRM Component
Original file line number Diff line number Diff line change @@ -100,7 +100,7 @@ const SettingsForm = ({
100
100
} ,
101
101
onSuccess : ( ) => {
102
102
notify (
103
- 'An reset password email has been sent to your email address'
103
+ 'A reset password email has been sent to your email address'
104
104
) ;
105
105
} ,
106
106
onError : e => {
You can’t perform that action at this time.
0 commit comments