Master into staging ln

.github/workflows/ci.yml

@@ -183,6 +183,8 @@ jobs:
           (cd $GOPATH/$GO_SRC_DIR; make ios)
   windows:
     runs-on: windows-2019
+    outputs:
+      artifact-url: ${{ steps.upload.outputs.artifact-url }}
     defaults:
       run:
         shell: bash
@@ -221,10 +223,12 @@ jobs:
           cd frontends/qt
           makensis setup.nsi
       - name: Upload Installer
+        id: upload
         uses: actions/upload-artifact@v4
         with:
           path: frontends/qt/BitBox-installer.exe
-          name: BitBoxApp-Windows-${{ github.sha }}.exe
+          name: BitBoxApp-windows-${{ github.sha }}.exe
+          if-no-files-found: error
 
   report-artifacts:
     needs: [android, qt-linux, macos, windows]

CHANGELOG.md

@@ -4,6 +4,8 @@
 - Fix long transaction notes to show fully on multiple lines when necessary
 - Improve send-to-self transactions in account overview
 - Use native scrollbars on macOS, iOS and Android
+- Fix address signing fail on screen rotation for Pocket and Bitsurance
+- Restrict selection to text files when importing notes
 
 # 4.46.3
 - Fix camera access on linux

frontends/android/BitBoxApp/app/src/main/java/ch/shiftcrypto/bitboxapp/MainActivity.java

@@ -332,7 +332,17 @@ public void onActivityResult(Uri uri) {
             @Override
             public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> filePathCallback, FileChooserParams fileChooserParams) {
                 MainActivity.this.filePathCallback = filePathCallback;
-                mGetContent.launch("*/*");
+                String[] mimeTypes = fileChooserParams.getAcceptTypes();
+                String fileType = "*/*";
+                if (mimeTypes.length == 1) {
+                    // import notes form uses .txt file type, but is not supported here.
+                    if (".txt".equals(mimeTypes[0])) {
+                        fileType = "text/plain";
+                    } else if (MimeTypeMap.getSingleton().hasMimeType(mimeTypes[0])) {
+                        fileType = mimeTypes[0];
+                    }
+                }
+                mGetContent.launch(fileType);
                 return true;
             }
         });

frontends/web/.eslintrc.json

@@ -57,7 +57,17 @@
   "overrides": [
     {
       "files": ["**/*.ts?(x)"],
-      "rules": { }
+      "rules": {
+        "@typescript-eslint/restrict-template-expressions": ["error", {
+          "allowNumber": true,
+          "allowAny": false,
+          "allowBoolean": false,
+          "allowNullish": false
+        }]
+      },
+      "parserOptions": {
+        "project": ["./tsconfig.json"]
+      }
     },
     {
       "files": ["**/*.test.ts?(x)"],

frontends/web/src/api/account.ts

@@ -65,7 +65,7 @@ export interface IAccount {
   active: boolean;
   watch: boolean;
   coinCode: CoinCode;
-  coinUnit: string;
+  coinUnit: CoinUnit;
   coinName: string;
   code: AccountCode;
   name: string;

frontends/web/src/api/bitbox01.ts

@@ -34,6 +34,6 @@ export type DeviceInfo = {
 
 export const getDeviceInfo = (
   deviceID: string,
-): Promise<DeviceInfo> => {
+): Promise<DeviceInfo | null> => {
   return apiGet(`devices/${deviceID}/info`);
 };

frontends/web/src/api/subscribe.ts

@@ -42,7 +42,7 @@ export const subscribeEndpoint = <T>(
         .catch(console.error);
       break;
     default:
-      throw new Error(`Event: ${event} not supported`);
+      throw new Error(`Event: ${JSON.stringify(event)} not supported`);
     }
   });
 };

frontends/web/src/components/forms/select.tsx

@@ -41,7 +41,7 @@ export const Select = ({
       <select id={id} {...props}>
         {options.map(({ value, text, disabled = false }) => (
           <option
-            key={`${value}`}
+            key={String(value)}
             value={value}
             disabled={disabled}
           >

frontends/web/src/components/icon/logo.module.css

@@ -9,16 +9,8 @@
     width: 100% !important;
 }
 
-.swissOpenSource.large {
-    max-width: 280px !important;
-}
-
 @media (max-width: 768px) {
     .swissOpenSource {
         max-width: 180px !important;
     }
-
-    .swissOpenSource.large {
-        max-width: 210px !important;
-    }
 }

frontends/web/src/components/icon/logo.tsx

@@ -58,23 +58,22 @@ import PAXG_GREY from './assets/paxg-white.svg';
 import ShiftLogo from './assets/shift-cryptosecurity-logo.svg';
 import style from './logo.module.css';
 
-interface GenericProps {
-    [property: string]: any;
-}
 
-export const BitBox = (props: GenericProps) => <img {...props} draggable={false} src={BitBoxLogo} alt="BitBox" className={style.logo} />;
-export const BitBox02 = (props: GenericProps) => <img {...props} draggable={false} src={BitBox02Logo} alt="BitBox02" className={style.logo} />;
-export const BitBox02Inverted = (props: GenericProps) => <img {...props} draggable={false} src={BitBox02InvertedLogo} alt="BitBox02" className={style.logo} />;
-export const AppLogo = (props: GenericProps) => <img {...props} draggable={false} src={AppLogoImg} alt="BitBox" className={style.logo} />;
-export const AppLogoInverted = (props: GenericProps) => <img {...props} draggable={false} src={AppLogoInvertedImg} alt="BitBox" className={style.logo} />;
-export const BitBoxSwiss = (props: GenericProps) => <img {...props} draggable={false} src={BitBoxSwissLogo} alt="BitBox" className={style.logo} />;
-export const BitBoxSwissInverted = (props: GenericProps) => <img {...props} draggable={false} src={BitBoxSwissInvertedLogo} alt="BitBox" className={style.logo} />;
-export const Shift = (props: GenericProps) => <img {...props} draggable={false} src={ShiftLogo} alt="Shift Crypto" className={style.logo} />;
-export const SwissMadeOpenSource = ({ large: boolean, className, ...props }: GenericProps) => <img {...props} draggable={false} src={SwissOpenSourceLight} alt="Swiss Made Open Source" className={`${style.swissOpenSource} ${props.large ? style.large : ''} ${className ? className : ''}`} />;
-export const SwissMadeOpenSourceDark = ({ large: boolean, className, ...props }: GenericProps) => <img {...props} draggable={false} src={SwissOpenSourceDark} alt="Swiss Made Open Source" className={`${style.swissOpenSource} ${props.large ? style.large : ''} ${className ? className : ''}`} />;
+type ImgProps = JSX.IntrinsicElements['img'];
+
+export const BitBox = (props: ImgProps) => <img {...props} draggable={false} src={BitBoxLogo} alt="BitBox" className={style.logo} />;
+export const BitBox02 = (props: ImgProps) => <img {...props} draggable={false} src={BitBox02Logo} alt="BitBox02" className={style.logo} />;
+export const BitBox02Inverted = (props: ImgProps) => <img {...props} draggable={false} src={BitBox02InvertedLogo} alt="BitBox02" className={style.logo} />;
+export const AppLogo = (props: ImgProps) => <img {...props} draggable={false} src={AppLogoImg} alt="BitBox" className={style.logo} />;
+export const AppLogoInverted = (props: ImgProps) => <img {...props} draggable={false} src={AppLogoInvertedImg} alt="BitBox" className={style.logo} />;
+export const BitBoxSwiss = (props: ImgProps) => <img {...props} draggable={false} src={BitBoxSwissLogo} alt="BitBox" className={style.logo} />;
+export const BitBoxSwissInverted = (props: ImgProps) => <img {...props} draggable={false} src={BitBoxSwissInvertedLogo} alt="BitBox" className={style.logo} />;
+export const Shift = (props: ImgProps) => <img {...props} draggable={false} src={ShiftLogo} alt="Shift Crypto" className={style.logo} />;
+export const SwissMadeOpenSource = ({ className, ...props }: ImgProps) => <img {...props} draggable={false} src={SwissOpenSourceLight} alt="Swiss Made Open Source" className={`${style.swissOpenSource} ${className ? className : ''}`} />;
+export const SwissMadeOpenSourceDark = ({ className, ...props }: ImgProps) => <img {...props} draggable={false} src={SwissOpenSourceDark} alt="Swiss Made Open Source" className={`${style.swissOpenSource} ${className ? className : ''}`} />;
 
 type LogoMap = {
-    [key in CoinCode]: string[];
+  [key in CoinCode]: string[];
 }
 
 const logoMap: LogoMap = {
@@ -100,20 +99,20 @@ const logoMap: LogoMap = {
   'eth-erc20-paxg': [PAXG, PAXG_GREY],
 };
 
-interface Props {
-    active?: boolean;
-    alt?: string;
-    className?: string;
-    coinCode: CoinCode;
-    stacked?: boolean;
+type LogoProps = {
+  active?: boolean;
+  alt?: string;
+  className?: string;
+  coinCode: CoinCode;
+  stacked?: boolean;
 }
 
 export const Logo = ({
   coinCode,
   active,
   stacked,
   ...rest
-}: Props) => {
+}: LogoProps) => {
   if (!logoMap[coinCode]) {
     console.error('logo undefined for ', coinCode);
     return null;

frontends/web/src/components/transactions/transaction.tsx

@@ -199,7 +199,7 @@ const Amounts = ({
               <Arrow type="send_to_self" />
             </span>
           )}
-          {conversionPrefix && (
+          {(conversionPrefix && !sendToSelf) && (
             <span className={styles.txPrefix}>
               {conversionPrefix}
               {' '}

frontends/web/src/contexts/WCWeb3WalletProvider.tsx

@@ -23,8 +23,8 @@ import { useLoad } from '@/hooks/api';
 import { getConfig, setConfig } from '@/utils/config';
 
 type TProps = {
-    children: ReactNode;
-  }
+  children: ReactNode;
+}
 
 export const WCWeb3WalletProvider = ({ children }: TProps) => {
   const { t } = useTranslation();
@@ -83,13 +83,13 @@ export const WCWeb3WalletProvider = ({ children }: TProps) => {
       }
       await web3wallet?.core.pairing.pair({ uri });
       setConfig({ frontend: { hasUsedWalletConnect: true } });
-    } catch (e: any) {
-      console.error(`Wallet connect attempt to pair error ${e}`);
-      if (e.message.includes('Pairing already exists')) {
+    } catch (error: any) {
+      console.error('Wallet connect attempt to pair error', error);
+      if (error?.message?.includes('Pairing already exists')) {
         throw new Error(t('walletConnect.useNewUri'));
       }
       //unexpected error, display native error message
-      throw new Error(e.message);
+      throw new Error(error.message);
     }
   };
 

frontends/web/src/hooks/sdcard.ts

@@ -37,7 +37,7 @@ export const useSDCard = (
       switch (devices[deviceID]) {
       case 'bitbox':
         return getBitBox01DeviceInfo(deviceID)
-          .then(({ sdcard }) => sdcard);
+          .then(deviceInfo => deviceInfo ? deviceInfo.sdcard : Promise.reject(`Could get device info for ${deviceID}`));
       case 'bitbox02':
         return checkSDCard(deviceID);
       default:

frontends/web/src/i18n/i18n.test.tsx

@@ -39,7 +39,7 @@ describe('i18n', () => {
       { nativeLocale: 'fr', newLang: 'en', userLang: 'en' },
     ];
     table.forEach((test) => {
-      it(`sets userLanguage to ${test.userLang} if native-locale is ${test.nativeLocale}`, async () => {
+      it(`sets userLanguage to ${test.userLang || 'null'} if native-locale is ${test.nativeLocale}`, async () => {
         (apiGet as Mock).mockImplementation(endpoint => {
           switch (endpoint) {
           case 'config': { return Promise.resolve({}); }

frontends/web/src/routes/account/info/buyReceiveCTA.tsx

@@ -54,14 +54,16 @@ export const BuyReceiveCTA = ({
   const isMobile = useMediaQuery('(max-width: 768px)');
 
   const onExchangeCTA = () => navigate(code ? `/exchange/info/${code}` : '/exchange/info');
-  const onWalletConnect = () => navigate(`/account/${code}/wallet-connect/dashboard`);
+  const onWalletConnect = () => code && navigate(`/account/${code}/wallet-connect/dashboard`);
   const onReceiveCTA = () => {
     if (balanceList) {
       if (balanceList.length > 1) {
         navigate('/accounts/select-receive');
         return;
       }
-      navigate(`/account/${code}/receive`);
+      if (code) {
+        navigate(`/account/${code}/receive`);
+      }
     }
   };
 

frontends/web/src/routes/account/info/info.tsx

@@ -28,8 +28,8 @@ import { Status } from '@/components/status/status';
 import style from './info.module.css';
 
 type TProps = {
-    accounts: IAccount[];
-    code: AccountCode;
+  accounts: IAccount[];
+  code: AccountCode;
 };
 
 export const Info = ({
@@ -57,6 +57,8 @@ export const Info = ({
     setViewXPub((viewXPub + 1) % numberOfXPubs);
   };
 
+  const xpubType = xpubTypes[(viewXPub + 1) % numberOfXPubs];
+
   return (
     <div className="contentWithGuide">
       <div className="container">
@@ -75,10 +77,13 @@ export const Info = ({
                     current: `${viewXPub + 1}`,
                     numberOfXPubs: numberOfXPubs.toString(),
                     scriptType: config.bitcoinSimple.scriptType.toUpperCase(),
-                  })}<br />
-                  <button className={style.nextButton} onClick={showNextXPub}>
-                    {t(`accountInfo.xpubTypeChangeBtn.${xpubTypes[(viewXPub + 1) % numberOfXPubs]}`)}
-                  </button>
+                  })}
+                  <br />
+                  {xpubType && (
+                    <button className={style.nextButton} onClick={showNextXPub}>
+                      {t(`accountInfo.xpubTypeChangeBtn.${xpubType}`)}
+                    </button>
+                  )}
                 </p>
               ) : null}
               { (config.bitcoinSimple?.scriptType === 'p2tr') ? (

frontends/web/src/routes/account/send/components/confirm/confirm.tsx

@@ -25,28 +25,23 @@ import { TConfirmSendProps } from '@/routes/account/send/components/confirm/type
 import { ConfirmingWaitDialog } from '@/routes/account/send/components/confirm/dialogs/confirm-wait-dialog';
 import style from './confirm.module.css';
 
+type TConfirmSend = { bb01Paired: boolean | undefined } & TConfirmSendProps;
+
 type TFiatValueProps = {
   baseCurrencyUnit: ConversionUnit;
   amount: string
 }
 
-export const ConfirmSend = (props: TConfirmSendProps) => {
-  switch (props.device) {
-  case 'bitbox':
-    return (
-      <ConfirmingWaitDialog
-        {...props}
-      />
-    );
-  case 'bitbox02':
-    return (
-      <BB02ConfirmSend
-        {...props}
-      />
-    );
-  default:
-    return null;
-  }
+export const ConfirmSend = (props: TConfirmSend) => {
+  return (props.bb01Paired !== undefined ? (
+    <ConfirmingWaitDialog
+      {...props}
+    />
+  ) : (
+    <BB02ConfirmSend
+      {...props}
+    />
+  ));
 };
 
 export const BB02ConfirmSend = ({
@@ -57,7 +52,7 @@ export const BB02ConfirmSend = ({
   selectedUTXOs,
   coinCode,
   transactionDetails
-}: Omit<TConfirmSendProps, 'device'>) => {
+}: TConfirmSendProps) => {
 
   const { t } = useTranslation();
   const {

frontends/web/src/routes/account/send/components/confirm/dialogs/confirm-wait-dialog.tsx

@@ -31,7 +31,7 @@ export const ConfirmingWaitDialog = ({
   selectedUTXOs,
   coinCode,
   transactionDetails
-}: Omit<TConfirmSendProps, 'device'>) => {
+}: TConfirmSendProps) => {
   const { t } = useTranslation();
   const [signProgress, setSignProgress] = useState<TSignProgress>();
 

frontends/web/src/routes/account/send/components/confirm/types.ts

@@ -15,7 +15,6 @@
  */
 
 import { ConversionUnit, CoinCode, FeeTargetCode, Fiat, IAmount } from '@/api/account';
-import { TProductName } from '@/api/devices';
 
 export type TransactionDetails = {
     proposedAmount?: IAmount;
@@ -28,7 +27,6 @@ export type TransactionDetails = {
   }
 
 export type TConfirmSendProps = {
-    device: TProductName;
     baseCurrencyUnit: ConversionUnit;
     note: string;
     hasSelectedUTXOs: boolean;