Merge branch 'fix-app-button-console-warning' into master

1 files changed, 2 insertions, 3 deletions

diff --git a/gui/src/renderer/components/AppButton.tsx b/gui/src/renderer/components/AppButton.tsx
index d99d1494f5..54a3039078 100644
--- a/gui/src/renderer/components/AppButton.tsx
+++ b/gui/src/renderer/components/AppButton.tsx
@@ -47,7 +47,7 @@ export interface IProps extends React.HTMLAttributes<HTMLButtonElement> {
 }
 
 const BaseButton = React.memo(function BaseButtonT(props: IProps) {
-  const { children, ...otherProps } = props;
+  const { children, textOffset, ...otherProps } = props;
 
   const [textAdjustment, setTextAdjustment] = useState(0);
   const buttonRef = useRef() as React.RefObject<HTMLButtonElement>;
@@ -66,8 +66,7 @@ const BaseButton = React.memo(function BaseButtonT(props: IProps) {
       const trailingSpace = buttonRect.width - (leftDiff + textRect.width);
 
       // calculate text adjustment
-      const textOffset = props.textOffset ?? 0;
-      const textAdjustment = leftDiff - trailingSpace - textOffset;
+      const textAdjustment = leftDiff - trailingSpace - (textOffset ?? 0);
 
       // re-render the view with the new text adjustment if it changed
       setTextAdjustment(textAdjustment);