Skip to content

Commit 6580b45

Browse files
committed
fix console errors
1 parent 0ae5eb7 commit 6580b45

File tree

9 files changed

+119
-112
lines changed

9 files changed

+119
-112
lines changed

assets/src/dashboard/parts/connected/Sidebar.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ const Sidebar = ({ settings, setSettings, setCanSave, setTab }) => {
3838
domain = user?.domain;
3939
}
4040

41+
if ( user?.domain_dns !== undefined && '' !== user?.domain_dns ) {
42+
domain = user?.domain_dns;
43+
}
44+
4145
return {
4246
name: user?.display_name,
4347
domain,

assets/src/dashboard/parts/connected/dashboard/LastImages.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,11 @@ const LastImages = () => {
148148
{ ( ! isInitialLoading && ! isLoaded ) && (
149149
<>
150150
<div className="flex justify-between mt-5 gap-5">
151-
{ [ ...Array( 4 ) ].map( () => <ImagePlaceholder/> ) }
151+
{ [ ...Array( 4 ) ].map( ( _, index ) => <ImagePlaceholder key={ index }/> ) }
152152
</div>
153153

154154
<div className="flex justify-between mt-5 gap-5">
155-
{ [ ...Array( 4 ) ].map( () => <ImagePlaceholder/> ) }
155+
{ [ ...Array( 4 ) ].map( ( _, index ) => <ImagePlaceholder key={ `placeholder-2-${ index }` }/> ) }
156156
</div>
157157
</>
158158
) }
@@ -169,6 +169,7 @@ const LastImages = () => {
169169
{ [ ...Array( 4 ) ].map( ( i, key ) => {
170170
return (
171171
<Image
172+
key={ key }
172173
src={ images[ key ].url }
173174
oldSize={ images[ key ].ex_size_raw }
174175
newSize={ images[ key ].new_size_raw }
@@ -184,6 +185,7 @@ const LastImages = () => {
184185

185186
return (
186187
<Image
188+
key={ key }
187189
src={ images[ key ].url }
188190
oldSize={ images[ key ].ex_size_raw }
189191
newSize={ images[ key ].new_size_raw }

assets/src/dashboard/parts/connected/settings/Compression.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ const Compression = ({
221221
<hr className="my-8 border-grayish-blue"/>
222222
<ToggleControl
223223
label={ optimoleDashboardApp.strings.options_strings.best_format_title }
224-
help={ () => <p dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.best_format_desc } } /> }
224+
help={ () => <span dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.best_format_desc } } /> }
225225
checked={ isBestFormatEnabled }
226226
disabled={ isLoading }
227227
className={ classnames(
@@ -236,7 +236,7 @@ const Compression = ({
236236

237237
<ToggleControl
238238
label={ optimoleDashboardApp.strings.options_strings.enable_retina_title }
239-
help={ () => <p dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.enable_retina_desc } } /> }
239+
help={ () => <span dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.enable_retina_desc } } /> }
240240
checked={ isRetinaEnabled }
241241
disabled={ isLoading }
242242
className={ classnames(
@@ -249,7 +249,7 @@ const Compression = ({
249249
<hr className="my-8 border-grayish-blue"/>
250250
<ToggleControl
251251
label={ optimoleDashboardApp.strings.options_strings.enable_network_opt_title }
252-
help={ () => <p dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.enable_network_opt_desc } } /> }
252+
help={ () => <span dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.enable_network_opt_desc } } /> }
253253
checked={ isNetworkOptimizationEnabled }
254254
disabled={ isLoading }
255255
className={ classnames(
@@ -264,7 +264,7 @@ const Compression = ({
264264

265265
<ToggleControl
266266
label={ optimoleDashboardApp.strings.options_strings.toggle_cdn }
267-
help={ () => <p dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.cdn_desc } } /> }
267+
help={ () => <span dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.cdn_desc } } /> }
268268
checked={ isCDNEnabled }
269269
disabled={ isLoading }
270270
className={ classnames(
@@ -280,7 +280,7 @@ const Compression = ({
280280

281281
<ToggleControl
282282
label={ optimoleDashboardApp.strings.options_strings.strip_meta_title }
283-
help={ () => <p dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.strip_meta_desc } } /> }
283+
help={ () => <span dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.strip_meta_desc } } /> }
284284
checked={ isStripMetadataEnabled }
285285
disabled={ isLoading }
286286
className={ classnames(
@@ -298,7 +298,7 @@ const Compression = ({
298298
>
299299
<ToggleControl
300300
label={ optimoleDashboardApp.strings.options_strings.quality_title }
301-
help={ () => <p dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.ml_quality_desc } } /> }
301+
help={ () => <span dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.ml_quality_desc } } /> }
302302
checked={ isAutoQualityEnabled }
303303
disabled={ isLoading }
304304
className={ classnames(

assets/src/dashboard/parts/connected/settings/General.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ const General = ({
6464
<>
6565
<ToggleControl
6666
label={ optimoleDashboardApp.strings.options_strings.enable_image_replace }
67-
help={ () => <p dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.replacer_desc } } /> }
67+
help={ () => <span dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.replacer_desc } } /> }
6868
checked={ isReplacerEnabled }
6969
disabled={ isLoading }
7070
className={ classnames(
@@ -80,7 +80,7 @@ const General = ({
8080
{ isUserActive && <>
8181
<ToggleControl
8282
label={ optimoleDashboardApp.strings.options_strings.enable_badge_title }
83-
help={ () => <p dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.enable_badge_description } } /> }
83+
help={ () => <span dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.enable_badge_description } } /> }
8484
checked={ isBannerEnabled }
8585
disabled={ isLoading }
8686
className={ classnames(
@@ -113,9 +113,9 @@ const General = ({
113113
/>
114114
</Button>
115115
{ showBadgeSettings && (
116-
<div class="mt-4 space-y-4 pl-4 pt-2">
117-
<div class="flex items-center justify-between mb-4">
118-
<label class="text-gray-600 font-medium">{ optimoleDashboardApp.strings.options_strings.enable_badge_show_icon }</label>
116+
<div className="mt-4 space-y-4 pl-4 pt-2">
117+
<div className="flex items-center justify-between mb-4">
118+
<label className="text-gray-600 font-medium">{ optimoleDashboardApp.strings.options_strings.enable_badge_show_icon }</label>
119119
<ToggleControl
120120
label=""
121121
checked={ isShowBadgeIcon }
@@ -129,9 +129,9 @@ const General = ({
129129
onChange={ value => updateOption( 'show_badge_icon', value ) }
130130
/>
131131
</div>
132-
<div class="flex items-center justify-between">
133-
<label class="text-gray-600 font-medium">{ optimoleDashboardApp.strings.options_strings.enable_badge_position }</label>
134-
<div class="flex space-x-2">
132+
<div className="flex items-center justify-between">
133+
<label className="text-gray-600 font-medium">{ optimoleDashboardApp.strings.options_strings.enable_badge_position }</label>
134+
<div className="flex space-x-2">
135135
<Button
136136
className={ classnames(
137137
'px-4 py-2 border rounded border-[1px]',

assets/src/dashboard/parts/connected/settings/Lazyload.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ const Lazyload = ({ settings, setSettings, setCanSave }) => {
173173
<>
174174
<ToggleControl
175175
label={options_strings.toggle_lazyload}
176-
help={() => <p dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.lazyload_desc } } />}
176+
help={() => <span dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.lazyload_desc } } />}
177177
checked={isLazyLoadEnabled}
178178
disabled={isLoading}
179179
className={classnames({
@@ -189,7 +189,7 @@ const Lazyload = ({ settings, setSettings, setCanSave }) => {
189189
<>
190190
<ToggleControl
191191
label={options_strings.toggle_lazyload}
192-
help={() => <p dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.lazyload_desc } } />}
192+
help={() => <span dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.lazyload_desc } } />}
193193
checked={isLazyLoadEnabled}
194194
disabled={isLoading}
195195
className={classnames({

assets/src/dashboard/parts/connected/settings/Resize.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ const Resize = ({
9393
<>
9494
<ToggleControl
9595
label={ optimoleDashboardApp.strings.options_strings.enable_resize_smart_title }
96-
help={ () => <p dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.enable_resize_smart_desc } } /> }
96+
help={ () => <span dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.enable_resize_smart_desc } } /> }
9797
checked={ isSmartResizeEnabled }
9898
disabled={ isLoading }
9999
className={ classnames(
@@ -108,7 +108,7 @@ const Resize = ({
108108

109109
<ToggleControl
110110
label={ optimoleDashboardApp.strings.options_strings.enable_limit_dimensions_title }
111-
help={ () => <p dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.enable_limit_dimensions_desc } } /> }
111+
help={ () => <span dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.enable_limit_dimensions_desc } } /> }
112112
checked={ isLimitDimensionsEnabled }
113113
disabled={ isLoading }
114114
className={ classnames(

0 commit comments

Comments
 (0)