diff --git a/web/account/siwe-button.react.js b/web/account/siwe-button.react.js
new file mode 100644
index 000000000..022267830
--- /dev/null
+++ b/web/account/siwe-button.react.js
@@ -0,0 +1,36 @@
+// @flow
+
+import * as React from 'react';
+import { FaEthereum } from 'react-icons/fa';
+
+import Button from '../components/button.react';
+import css from './siwe.css';
+
+type SIWEButtonProps = {
+  +onSIWEButtonClick: () => void,
+};
+function SIWEButton(props: SIWEButtonProps): React.Node {
+  const { onSIWEButtonClick } = props;
+
+  const siweButtonColor = React.useMemo(
+    () => ({ backgroundColor: 'white', color: 'black' }),
+    [],
+  );
+
+  return (
+    <div className={css.siweContainer}>
+      <Button
+        onClick={onSIWEButtonClick}
+        variant="filled"
+        buttonColor={siweButtonColor}
+      >
+        <div className={css.ethereumLogoContainer}>
+          <FaEthereum />
+        </div>
+        Sign in with Ethereum
+      </Button>
+    </div>
+  );
+}
+
+export default SIWEButton;
diff --git a/web/account/siwe.react.js b/web/account/siwe.react.js
index 83d1bff84..ca5276242 100644
--- a/web/account/siwe.react.js
+++ b/web/account/siwe.react.js
@@ -1,192 +1,174 @@
 // @flow
 
 import '@rainbow-me/rainbowkit/dist/index.css';
 
 import olm from '@matrix-org/olm';
 import { ConnectButton, useConnectModal } from '@rainbow-me/rainbowkit';
 import invariant from 'invariant';
 import * as React from 'react';
-import { FaEthereum } from 'react-icons/fa';
 import { useDispatch } from 'react-redux';
 import { useAccount, useSigner } from 'wagmi';
 
 import {
   getSIWENonce,
   getSIWENonceActionTypes,
   siweAuth,
   siweAuthActionTypes,
 } from 'lib/actions/siwe-actions';
 import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors';
 import type { LogInStartingPayload } from 'lib/types/account-types.js';
 import {
   useDispatchActionPromise,
   useServerCall,
 } from 'lib/utils/action-utils';
 import {
   createSIWEMessage,
   getSIWEStatementForPublicKey,
   siweMessageSigningExplanationStatements,
 } from 'lib/utils/siwe-utils.js';
 
 import Button from '../components/button.react';
 import LoadingIndicator from '../loading-indicator.react';
 import { setPrimaryIdentityPublicKey } from '../redux/primary-identity-public-key-reducer';
 import { useSelector } from '../redux/redux-utils';
 import { webLogInExtraInfoSelector } from '../selectors/account-selectors.js';
+import SIWEButton from './siwe-button.react.js';
 import css from './siwe.css';
 
 const getSIWENonceLoadingStatusSelector = createLoadingStatusSelector(
   getSIWENonceActionTypes,
 );
 function SIWE(): React.Node {
   const { openConnectModal } = useConnectModal();
   const { address } = useAccount();
   const { data: signer } = useSigner();
   const dispatch = useDispatch();
   const dispatchActionPromise = useDispatchActionPromise();
   const getSIWENonceCall = useServerCall(getSIWENonce);
   const getSIWENonceCallLoadingStatus = useSelector(
     getSIWENonceLoadingStatusSelector,
   );
   const siweAuthCall = useServerCall(siweAuth);
   const logInExtraInfo = useSelector(webLogInExtraInfoSelector);
 
   const [siweNonce, setSIWENonce] = React.useState<?string>(null);
   const [
     hasSIWEButtonBeenClicked,
     setHasSIWEButtonBeenClicked,
   ] = React.useState<boolean>(false);
 
   const siweNonceShouldBeFetched =
     !siweNonce &&
     getSIWENonceCallLoadingStatus !== 'loading' &&
     (signer || hasSIWEButtonBeenClicked);
 
   React.useEffect(() => {
     if (!siweNonceShouldBeFetched) {
       return;
     }
     dispatchActionPromise(
       getSIWENonceActionTypes,
       (async () => {
         const response = await getSIWENonceCall();
         setSIWENonce(response);
       })(),
     );
   }, [dispatchActionPromise, getSIWENonceCall, siweNonceShouldBeFetched]);
 
   const primaryIdentityPublicKey = useSelector(
     state => state.primaryIdentityPublicKey,
   );
   React.useEffect(() => {
     (async () => {
       await olm.init();
       const account = new olm.Account();
       account.create();
       const { ed25519 } = JSON.parse(account.identity_keys());
       dispatch({
         type: setPrimaryIdentityPublicKey,
         payload: ed25519,
       });
     })();
   }, [dispatch]);
 
-  const siweButtonColor = React.useMemo(
-    () => ({ backgroundColor: 'white', color: 'black' }),
-    [],
-  );
-
   const callSIWEAuthEndpoint = React.useCallback(
     (message: string, signature: string, extraInfo) =>
       siweAuthCall({
         message,
         signature,
         ...extraInfo,
       }),
     [siweAuthCall],
   );
 
   const attemptSIWEAuth = React.useCallback(
     (message: string, signature: string) => {
       const extraInfo = logInExtraInfo();
       dispatchActionPromise(
         siweAuthActionTypes,
         callSIWEAuthEndpoint(message, signature, extraInfo),
         undefined,
         ({ calendarQuery: extraInfo.calendarQuery }: LogInStartingPayload),
       );
     },
     [callSIWEAuthEndpoint, dispatchActionPromise, logInExtraInfo],
   );
 
   const onSignInButtonClick = React.useCallback(async () => {
     invariant(siweNonce, 'nonce must be present during SIWE attempt');
     invariant(
       primaryIdentityPublicKey,
       'primaryIdentityPublicKey must be present during SIWE attempt',
     );
     const statement = getSIWEStatementForPublicKey(primaryIdentityPublicKey);
     const message = createSIWEMessage(address, statement, siweNonce);
     const signature = await signer.signMessage(message);
     attemptSIWEAuth(message, signature);
   }, [address, attemptSIWEAuth, primaryIdentityPublicKey, signer, siweNonce]);
 
   let siweLoginForm;
   if (signer && (!siweNonce || !primaryIdentityPublicKey)) {
     siweLoginForm = (
       <div className={css.connectButtonContainer}>
         <LoadingIndicator status="loading" size="medium" />
       </div>
     );
   } else if (signer) {
     siweLoginForm = (
       <div className={css.siweLoginFormContainer}>
         <div className={css.connectButtonContainer}>
           <ConnectButton />
         </div>
         <p>{siweMessageSigningExplanationStatements[0]}</p>
         <p>{siweMessageSigningExplanationStatements[1]}</p>
         <p>
           By signing up, you agree to our{' '}
           <a href="https://comm.app/terms">Terms of Use</a> &{' '}
           <a href="https://comm.app/privacy">Privacy Policy</a>.
         </p>
         <Button variant="filled" onClick={onSignInButtonClick}>
           Sign in
         </Button>
       </div>
     );
   }
 
   const onSIWEButtonClick = React.useCallback(() => {
     setHasSIWEButtonBeenClicked(true);
     openConnectModal && openConnectModal();
   }, [openConnectModal]);
 
   let siweButton;
   if (openConnectModal) {
-    siweButton = (
-      <>
-        <Button
-          onClick={onSIWEButtonClick}
-          variant="filled"
-          buttonColor={siweButtonColor}
-        >
-          <div className={css.ethereumLogoContainer}>
-            <FaEthereum />
-          </div>
-          Sign in with Ethereum
-        </Button>
-      </>
-    );
+    siweButton = <SIWEButton onSIWEButtonClick={onSIWEButtonClick} />;
   }
   return (
     <div className={css.siweContainer}>
       <hr />
       {siweLoginForm}
       {siweButton}
     </div>
   );
 }
 
 export default SIWE;