diff --git a/web/cashtab/src/components/Configure/Configure.js b/web/cashtab/src/components/Configure/Configure.js
index 99ba1e7ac..07f8f9f7f 100644
--- a/web/cashtab/src/components/Configure/Configure.js
+++ b/web/cashtab/src/components/Configure/Configure.js
@@ -1,605 +1,664 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import React, { useState, useEffect } from 'react';
 import styled from 'styled-components';
 import { Collapse, Form, Input, Modal, Alert } from 'antd';
 import {
     PlusSquareOutlined,
     WalletFilled,
     ImportOutlined,
     LockOutlined,
 } from '@ant-design/icons';
 import { WalletContext } from '@utils/context';
 import { StyledCollapse } from '@components/Common/StyledCollapse';
 import {
     AntdFormWrapper,
     CurrencySelectDropdown,
 } from '@components/Common/EnhancedInputs';
 import PrimaryButton, {
     SecondaryButton,
     SmartButton,
 } from '@components/Common/PrimaryButton';
 import {
     ThemedCopyOutlined,
     ThemedWalletOutlined,
     ThemedDollarOutlined,
 } from '@components/Common/CustomIcons';
 import { ReactComponent as Trashcan } from '@assets/trashcan.svg';
 import { ReactComponent as Edit } from '@assets/edit.svg';
 import { Event } from '@utils/GoogleAnalytics';
 import ApiError from '@components/Common/ApiError';
+import { formatSavedBalance } from '@utils/validation';
 
 const { Panel } = Collapse;
 
 const SettingsLink = styled.a`
     text-decoration: underline;
     color: ${props => props.theme.primary};
     :visited {
         text-decoration: underline;
         color: ${props => props.theme.primary};
     }
     :hover {
         color: ${props => props.theme.brandSecondary};
     }
 `;
 
 const SWRow = styled.div`
     border-radius: 3px;
     padding: 10px 0;
     display: flex;
     align-items: center;
     justify-content: center;
     margin-bottom: 6px;
     @media (max-width: 500px) {
         flex-direction: column;
         margin-bottom: 12px;
     }
 `;
 
 const SWName = styled.div`
     width: 50%;
     display: flex;
     align-items: center;
     justify-content: space-between;
     word-wrap: break-word;
     hyphens: auto;
 
     @media (max-width: 500px) {
         width: 100%;
         justify-content: center;
         margin-bottom: 15px;
     }
 
     h3 {
         font-size: 16px;
         color: ${props => props.theme.wallet.text.secondary};
         margin: 0;
-        text-align: left;
+        text-align: center;
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
     }
+    h3.overflow {
+        width: 100px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
+    h3.overflow:hover {
+        background-color: #eee;
+        overflow: visible;
+        inline-size: 100px;
+        white-space: normal;
+    }
+`;
+
+const SWBalance = styled.div`
+    width: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    word-wrap: break-word;
+    hyphens: auto;
+    @media (max-width: 500px) {
+        width: 100%;
+        justify-content: center;
+        margin-bottom: 15px;
+    }
+    div {
+        font-size: 13px;
+        color: ${props => props.theme.wallet.text.secondary};
+        margin: 0;
+        text-align: center;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
+    div.overflow {
+        width: 150px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
+    div.overflow:hover {
+        background-color: #eee;
+        overflow: visible;
+        inline-size: 150px;
+        white-space: normal;
+    }
 `;
 
 const SWButtonCtn = styled.div`
     width: 50%;
     display: flex;
     align-items: center;
     justify-content: flex-end;
     @media (max-width: 500px) {
         width: 100%;
         justify-content: center;
     }
 
     button {
         cursor: pointer;
 
         @media (max-width: 768px) {
             font-size: 14px;
         }
     }
 
     svg {
         stroke: ${props => props.theme.wallet.text.secondary};
         fill: ${props => props.theme.wallet.text.secondary};
         width: 25px;
         height: 25px;
         margin-right: 20px;
         cursor: pointer;
 
         :first-child:hover {
             stroke: ${props => props.theme.primary};
             fill: ${props => props.theme.primary};
         }
         :hover {
             stroke: ${props => props.theme.settings.delete};
             fill: ${props => props.theme.settings.delete};
         }
     }
 `;
 
 const AWRow = styled.div`
     padding: 10px 0;
     display: flex;
     align-items: center;
     justify-content: space-between;
     margin-bottom: 6px;
     h3 {
         font-size: 16px;
         display: inline-block;
         color: ${props => props.theme.wallet.text.secondary};
         margin: 0;
         text-align: left;
         font-weight: bold;
         @media (max-width: 500px) {
             font-size: 14px;
         }
     }
     h4 {
         font-size: 16px;
         display: inline-block;
         color: ${props => props.theme.primary} !important;
         margin: 0;
         text-align: right;
     }
     @media (max-width: 500px) {
         flex-direction: column;
         margin-bottom: 12px;
     }
 `;
 
 const StyledConfigure = styled.div`
     h2 {
         color: ${props => props.theme.wallet.text.primary};
         font-size: 25px;
     }
     p {
         color: ${props => props.theme.wallet.text.secondary};
     }
 `;
 
 const StyledSpacer = styled.div`
     height: 1px;
     width: 100%;
     background-color: ${props => props.theme.wallet.borders.color};
     margin: 60px 0 50px;
 `;
 
 const Configure = () => {
     const ContextValue = React.useContext(WalletContext);
     const { wallet, apiError } = ContextValue;
 
     const {
         addNewSavedWallet,
         activateWallet,
         renameWallet,
         deleteWallet,
         validateMnemonic,
         getSavedWallets,
         cashtabSettings,
         changeCashtabSettings,
     } = ContextValue;
     const [savedWallets, setSavedWallets] = useState([]);
     const [formData, setFormData] = useState({
         dirty: true,
         mnemonic: '',
     });
     const [showRenameWalletModal, setShowRenameWalletModal] = useState(false);
     const [showDeleteWalletModal, setShowDeleteWalletModal] = useState(false);
     const [walletToBeRenamed, setWalletToBeRenamed] = useState(null);
     const [walletToBeDeleted, setWalletToBeDeleted] = useState(null);
     const [newWalletName, setNewWalletName] = useState('');
     const [
         confirmationOfWalletToBeDeleted,
         setConfirmationOfWalletToBeDeleted,
     ] = useState('');
     const [newWalletNameIsValid, setNewWalletNameIsValid] = useState(null);
     const [walletDeleteValid, setWalletDeleteValid] = useState(null);
     const [seedInput, openSeedInput] = useState(false);
 
     const showPopulatedDeleteWalletModal = walletInfo => {
         setWalletToBeDeleted(walletInfo);
         setShowDeleteWalletModal(true);
     };
 
     const showPopulatedRenameWalletModal = walletInfo => {
         setWalletToBeRenamed(walletInfo);
         setShowRenameWalletModal(true);
     };
     const cancelRenameWallet = () => {
         // Delete form value
         setNewWalletName('');
         setShowRenameWalletModal(false);
     };
     const cancelDeleteWallet = () => {
         setWalletToBeDeleted(null);
         setConfirmationOfWalletToBeDeleted('');
         setShowDeleteWalletModal(false);
     };
     const updateSavedWallets = async activeWallet => {
         if (activeWallet) {
             let savedWallets;
             try {
                 savedWallets = await getSavedWallets(activeWallet);
                 setSavedWallets(savedWallets);
             } catch (err) {
                 console.log(`Error in getSavedWallets()`);
                 console.log(err);
             }
         }
     };
 
     const [isValidMnemonic, setIsValidMnemonic] = useState(null);
 
     useEffect(() => {
         // Update savedWallets every time the active wallet changes
         updateSavedWallets(wallet);
     }, [wallet]);
 
     // Need this function to ensure that savedWallets are updated on new wallet creation
     const updateSavedWalletsOnCreate = async importMnemonic => {
         // Event("Category", "Action", "Label")
         // Track number of times a different wallet is activated
         Event('Configure.js', 'Create Wallet', 'New');
         const walletAdded = await addNewSavedWallet(importMnemonic);
         if (!walletAdded) {
             Modal.error({
                 title: 'This wallet already exists!',
                 content: 'Wallet not added',
             });
         } else {
             Modal.success({
                 content: 'Wallet added to your saved wallets',
             });
         }
         await updateSavedWallets(wallet);
     };
     // Same here
     // TODO you need to lock UI here until this is complete
     // Otherwise user may try to load an already-loading wallet, wreak havoc with indexedDB
     const updateSavedWalletsOnLoad = async walletToActivate => {
         // Event("Category", "Action", "Label")
         // Track number of times a different wallet is activated
         Event('Configure.js', 'Activate', '');
         await activateWallet(walletToActivate);
     };
 
     async function submit() {
         setFormData({
             ...formData,
             dirty: false,
         });
 
         // Exit if no user input
         if (!formData.mnemonic) {
             return;
         }
 
         // Exit if mnemonic is invalid
         if (!isValidMnemonic) {
             return;
         }
         // Event("Category", "Action", "Label")
         // Track number of times a different wallet is activated
         Event('Configure.js', 'Create Wallet', 'Imported');
         updateSavedWalletsOnCreate(formData.mnemonic);
     }
 
     const handleChange = e => {
         const { value, name } = e.target;
 
         // Validate mnemonic on change
         // Import button should be disabled unless mnemonic is valid
         setIsValidMnemonic(validateMnemonic(value));
 
         setFormData(p => ({ ...p, [name]: value }));
     };
 
     const changeWalletName = async () => {
         if (newWalletName === '' || newWalletName.length > 24) {
             setNewWalletNameIsValid(false);
             return;
         }
         // Hide modal
         setShowRenameWalletModal(false);
         // Change wallet name
         console.log(
             `Changing wallet ${walletToBeRenamed.name} name to ${newWalletName}`,
         );
         const renameSuccess = await renameWallet(
             walletToBeRenamed.name,
             newWalletName,
         );
 
         if (renameSuccess) {
             Modal.success({
                 content: `Wallet "${walletToBeRenamed.name}" renamed to "${newWalletName}"`,
             });
         } else {
             Modal.error({
                 content: `Rename failed. All wallets must have a unique name.`,
             });
         }
         await updateSavedWallets(wallet);
         // Clear wallet name for form
         setNewWalletName('');
     };
 
     const deleteSelectedWallet = async () => {
         if (!walletDeleteValid && walletDeleteValid !== null) {
             return;
         }
         if (
             confirmationOfWalletToBeDeleted !==
             `delete ${walletToBeDeleted.name}`
         ) {
             setWalletDeleteValid(false);
             return;
         }
 
         // Hide modal
         setShowDeleteWalletModal(false);
         // Change wallet name
         console.log(`Deleting wallet "${walletToBeDeleted.name}"`);
         const walletDeletedSuccess = await deleteWallet(walletToBeDeleted);
 
         if (walletDeletedSuccess) {
             Modal.success({
                 content: `Wallet "${walletToBeDeleted.name}" successfully deleted`,
             });
         } else {
             Modal.error({
                 content: `Error deleting ${walletToBeDeleted.name}.`,
             });
         }
         await updateSavedWallets(wallet);
         // Clear wallet delete confirmation from form
         setConfirmationOfWalletToBeDeleted('');
     };
 
     const handleWalletNameInput = e => {
         const { value } = e.target;
         // validation
         if (value && value.length && value.length < 24) {
             setNewWalletNameIsValid(true);
         } else {
             setNewWalletNameIsValid(false);
         }
 
         setNewWalletName(value);
     };
 
     const handleWalletToDeleteInput = e => {
         const { value } = e.target;
 
         if (value && value === `delete ${walletToBeDeleted.name}`) {
             setWalletDeleteValid(true);
         } else {
             setWalletDeleteValid(false);
         }
         setConfirmationOfWalletToBeDeleted(value);
     };
 
     return (
         <StyledConfigure>
             {walletToBeRenamed !== null && (
                 <Modal
                     title={`Rename Wallet ${walletToBeRenamed.name}`}
                     visible={showRenameWalletModal}
                     onOk={changeWalletName}
                     onCancel={() => cancelRenameWallet()}
                 >
                     <AntdFormWrapper>
                         <Form style={{ width: 'auto' }}>
                             <Form.Item
                                 validateStatus={
                                     newWalletNameIsValid === null ||
                                     newWalletNameIsValid
                                         ? ''
                                         : 'error'
                                 }
                                 help={
                                     newWalletNameIsValid === null ||
                                     newWalletNameIsValid
                                         ? ''
                                         : 'Wallet name must be a string between 1 and 24 characters long'
                                 }
                             >
                                 <Input
                                     prefix={<WalletFilled />}
                                     placeholder="Enter new wallet name"
                                     name="newName"
                                     value={newWalletName}
                                     onChange={e => handleWalletNameInput(e)}
                                 />
                             </Form.Item>
                         </Form>
                     </AntdFormWrapper>
                 </Modal>
             )}
             {walletToBeDeleted !== null && (
                 <Modal
                     title={`Are you sure you want to delete wallet "${walletToBeDeleted.name}"?`}
                     visible={showDeleteWalletModal}
                     onOk={deleteSelectedWallet}
                     onCancel={() => cancelDeleteWallet()}
                 >
                     <AntdFormWrapper>
                         <Form style={{ width: 'auto' }}>
                             <Form.Item
                                 validateStatus={
                                     walletDeleteValid === null ||
                                     walletDeleteValid
                                         ? ''
                                         : 'error'
                                 }
                                 help={
                                     walletDeleteValid === null ||
                                     walletDeleteValid
                                         ? ''
                                         : 'Your confirmation phrase must match exactly'
                                 }
                             >
                                 <Input
                                     prefix={<WalletFilled />}
                                     placeholder={`Type "delete ${walletToBeDeleted.name}" to confirm`}
                                     name="walletToBeDeletedInput"
                                     value={confirmationOfWalletToBeDeleted}
                                     onChange={e => handleWalletToDeleteInput(e)}
                                 />
                             </Form.Item>
                         </Form>
                     </AntdFormWrapper>
                 </Modal>
             )}
             <h2>
                 <ThemedCopyOutlined /> Backup your wallet
             </h2>
             <Alert
                 style={{ marginBottom: '12px' }}
                 description="Your seed phrase is the only way to restore your wallet. Write it down. Keep it safe."
                 type="warning"
                 showIcon
             />
             {wallet && wallet.mnemonic && (
                 <StyledCollapse>
                     <Panel header="Click to reveal seed phrase" key="1">
                         <p className="notranslate">
                             {wallet && wallet.mnemonic ? wallet.mnemonic : ''}
                         </p>
                     </Panel>
                 </StyledCollapse>
             )}
             <StyledSpacer />
             <h2>
                 <ThemedWalletOutlined /> Manage Wallets
             </h2>
             {apiError ? (
                 <ApiError />
             ) : (
                 <>
                     <PrimaryButton onClick={() => updateSavedWalletsOnCreate()}>
                         <PlusSquareOutlined /> New Wallet
                     </PrimaryButton>
                     <SecondaryButton onClick={() => openSeedInput(!seedInput)}>
                         <ImportOutlined /> Import Wallet
                     </SecondaryButton>
                     {seedInput && (
                         <>
                             <p>
                                 Copy and paste your mnemonic seed phrase below
                                 to import an existing wallet
                             </p>
                             <AntdFormWrapper>
                                 <Form style={{ width: 'auto' }}>
                                     <Form.Item
                                         validateStatus={
                                             isValidMnemonic === null ||
                                             isValidMnemonic
                                                 ? ''
                                                 : 'error'
                                         }
                                         help={
                                             isValidMnemonic === null ||
                                             isValidMnemonic
                                                 ? ''
                                                 : 'Valid mnemonic seed phrase required'
                                         }
                                     >
                                         <Input
                                             prefix={<LockOutlined />}
                                             type="email"
                                             placeholder="mnemonic (seed phrase)"
                                             name="mnemonic"
                                             autoComplete="off"
                                             onChange={e => handleChange(e)}
                                             required
                                         />
                                     </Form.Item>
                                     <SmartButton
                                         disabled={!isValidMnemonic}
                                         onClick={() => submit()}
                                     >
                                         Import
                                     </SmartButton>
                                 </Form>
                             </AntdFormWrapper>
                         </>
                     )}
                 </>
             )}
             {savedWallets && savedWallets.length > 0 && (
                 <>
                     <StyledCollapse>
                         <Panel header="Saved wallets" key="2">
                             <AWRow>
                                 <h3>{wallet.name}</h3>
                                 <h4>Currently active</h4>
                             </AWRow>
                             <div>
                                 {savedWallets.map(sw => (
                                     <SWRow key={sw.name}>
                                         <SWName>
-                                            <h3>{sw.name}</h3>
+                                            <h3 className="overflow">
+                                                {sw.name}
+                                            </h3>
                                         </SWName>
-
+                                        <SWBalance>
+                                            <div className="overflow">
+                                                [
+                                                {sw && sw.state
+                                                    ? formatSavedBalance(
+                                                          sw.state.balances
+                                                              .totalBalance,
+                                                      )
+                                                    : 'N/A'}{' '}
+                                                XEC]
+                                            </div>
+                                        </SWBalance>
                                         <SWButtonCtn>
                                             <Edit
                                                 onClick={() =>
                                                     showPopulatedRenameWalletModal(
                                                         sw,
                                                     )
                                                 }
                                             />
                                             <Trashcan
                                                 onClick={() =>
                                                     showPopulatedDeleteWalletModal(
                                                         sw,
                                                     )
                                                 }
                                             />
                                             <button
                                                 onClick={() =>
                                                     updateSavedWalletsOnLoad(sw)
                                                 }
                                             >
                                                 Activate
                                             </button>
                                         </SWButtonCtn>
                                     </SWRow>
                                 ))}
                             </div>
                         </Panel>
                     </StyledCollapse>
                 </>
             )}
             <StyledSpacer />
             <h2>
                 <ThemedDollarOutlined /> Fiat Currency
             </h2>
             <AntdFormWrapper>
                 <CurrencySelectDropdown
                     defaultValue={
                         cashtabSettings && cashtabSettings.fiatCurrency
                             ? cashtabSettings.fiatCurrency
                             : 'usd'
                     }
                     onChange={fiatCode =>
                         changeCashtabSettings('fiatCurrency', fiatCode)
                     }
                 />
             </AntdFormWrapper>
             <StyledSpacer />[
             <SettingsLink
                 type="link"
                 href="https://docs.cashtabapp.com/docs/"
                 target="_blank"
                 rel="noreferrer"
             >
                 Documentation
             </SettingsLink>
             ]
         </StyledConfigure>
     );
 };
 
 export default Configure;
diff --git a/web/cashtab/src/components/Configure/__tests__/__snapshots__/Configure.test.js.snap b/web/cashtab/src/components/Configure/__tests__/__snapshots__/Configure.test.js.snap
index 840145997..fe8efb317 100644
--- a/web/cashtab/src/components/Configure/__tests__/__snapshots__/Configure.test.js.snap
+++ b/web/cashtab/src/components/Configure/__tests__/__snapshots__/Configure.test.js.snap
@@ -1,605 +1,605 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP @generated
 
 exports[`Configure with a wallet 1`] = `
 <div
-  className="sc-kEYyzF jqzglm"
+  className="sc-kkGfuU liSflp"
 >
   <h2>
     <span
       aria-label="copy"
       className="anticon anticon-copy sc-bdVaJa loPqmo"
       role="img"
     >
       <svg
         aria-hidden="true"
         data-icon="copy"
         fill="currentColor"
         focusable="false"
         height="1em"
         viewBox="64 64 896 896"
         width="1em"
       >
         <path
           d="M832 64H296c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h496v688c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8V96c0-17.7-14.3-32-32-32zM704 192H192c-17.7 0-32 14.3-32 32v530.7c0 8.5 3.4 16.6 9.4 22.6l173.3 173.3c2.2 2.2 4.7 4 7.4 5.5v1.9h4.2c3.5 1.3 7.2 2 11 2H704c17.7 0 32-14.3 32-32V224c0-17.7-14.3-32-32-32zM350 856.2L263.9 770H350v86.2zM664 888H414V746c0-22.1-17.9-40-40-40H232V264h432v624z"
         />
       </svg>
     </span>
      Backup your wallet
   </h2>
   <div
     className="ant-alert ant-alert-warning ant-alert-with-description"
     data-show={true}
     role="alert"
     style={
       Object {
         "marginBottom": "12px",
       }
     }
   >
     <span
       aria-label="exclamation-circle"
       className="anticon anticon-exclamation-circle ant-alert-icon"
       role="img"
     >
       <svg
         aria-hidden="true"
         data-icon="exclamation-circle"
         fill="currentColor"
         focusable="false"
         height="1em"
         viewBox="64 64 896 896"
         width="1em"
       >
         <path
           d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"
         />
         <path
           d="M464 688a48 48 0 1096 0 48 48 0 10-96 0zm24-112h48c4.4 0 8-3.6 8-8V296c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v272c0 4.4 3.6 8 8 8z"
         />
       </svg>
     </span>
     <div
       className="ant-alert-content"
     >
       <div
         className="ant-alert-message"
       />
       <div
         className="ant-alert-description"
       >
         Your seed phrase is the only way to restore your wallet. Write it down. Keep it safe.
       </div>
     </div>
   </div>
   <div
     className="ant-collapse ant-collapse-icon-position-left sc-EHOje iPpwBT"
     role={null}
   >
     <div
       className="ant-collapse-item"
     >
       <div
         aria-expanded={false}
         className="ant-collapse-header"
         onClick={[Function]}
         onKeyPress={[Function]}
         role="button"
         tabIndex={0}
       >
         <span
           aria-label="right"
           className="anticon anticon-right ant-collapse-arrow"
           role="img"
         >
           <svg
             aria-hidden="true"
             data-icon="right"
             fill="currentColor"
             focusable="false"
             height="1em"
             viewBox="64 64 896 896"
             width="1em"
           >
             <path
               d="M765.7 486.8L314.9 134.7A7.97 7.97 0 00302 141v77.3c0 4.9 2.3 9.6 6.1 12.6l360 281.1-360 281.1c-3.9 3-6.1 7.7-6.1 12.6V883c0 6.7 7.7 10.4 12.9 6.3l450.8-352.1a31.96 31.96 0 000-50.4z"
             />
           </svg>
         </span>
         Click to reveal seed phrase
       </div>
     </div>
   </div>
   <div
-    className="sc-kkGfuU lbBTMM"
+    className="sc-iAyFgw AbOBK"
   />
   <h2>
     <span
       aria-label="wallet"
       className="anticon anticon-wallet sc-htpNat fLtATP"
       role="img"
     >
       <svg
         aria-hidden="true"
         data-icon="wallet"
         fill="currentColor"
         focusable="false"
         height="1em"
         viewBox="64 64 896 896"
         width="1em"
       >
         <path
           d="M880 112H144c-17.7 0-32 14.3-32 32v736c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V144c0-17.7-14.3-32-32-32zm-40 464H528V448h312v128zm0 264H184V184h656v200H496c-17.7 0-32 14.3-32 32v192c0 17.7 14.3 32 32 32h344v200zM580 512a40 40 0 1080 0 40 40 0 10-80 0z"
         />
       </svg>
     </span>
      Manage Wallets
   </h2>
   <button
     className="sc-VigVT RpRhe"
     onClick={[Function]}
   >
     <span
       aria-label="plus-square"
       className="anticon anticon-plus-square"
       role="img"
     >
       <svg
         aria-hidden="true"
         data-icon="plus-square"
         fill="currentColor"
         focusable="false"
         height="1em"
         viewBox="64 64 896 896"
         width="1em"
       >
         <path
           d="M328 544h152v152c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V544h152c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8H544V328c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v152H328c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8z"
         />
         <path
           d="M880 112H144c-17.7 0-32 14.3-32 32v736c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V144c0-17.7-14.3-32-32-32zm-40 728H184V184h656v656z"
         />
       </svg>
     </span>
      New Wallet
   </button>
   <button
     className="sc-jTzLTM bLkbAy"
     onClick={[Function]}
   >
     <span
       aria-label="import"
       className="anticon anticon-import"
       role="img"
     >
       <svg
         aria-hidden="true"
         data-icon="import"
         fill="currentColor"
         focusable="false"
         height="1em"
         viewBox="64 64 896 896"
         width="1em"
       >
         <path
           d="M888.3 757.4h-53.8c-4.2 0-7.7 3.5-7.7 7.7v61.8H197.1V197.1h629.8v61.8c0 4.2 3.5 7.7 7.7 7.7h53.8c4.2 0 7.7-3.4 7.7-7.7V158.7c0-17-13.7-30.7-30.7-30.7H158.7c-17 0-30.7 13.7-30.7 30.7v706.6c0 17 13.7 30.7 30.7 30.7h706.6c17 0 30.7-13.7 30.7-30.7V765.1c0-4.3-3.5-7.7-7.7-7.7zM902 476H588v-76c0-6.7-7.8-10.5-13-6.3l-141.9 112a8 8 0 000 12.6l141.9 112c5.3 4.2 13 .4 13-6.3v-76h314c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8z"
         />
       </svg>
     </span>
      Import Wallet
   </button>
   <div
-    className="sc-kkGfuU lbBTMM"
+    className="sc-iAyFgw AbOBK"
   />
   <h2>
     <span
       aria-label="dollar"
       className="anticon anticon-dollar sc-bwzfXH iTQEyo"
       role="img"
     >
       <svg
         aria-hidden="true"
         data-icon="dollar"
         fill="currentColor"
         focusable="false"
         height="1em"
         viewBox="64 64 896 896"
         width="1em"
       >
         <path
           d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372zm47.7-395.2l-25.4-5.9V348.6c38 5.2 61.5 29 65.5 58.2.5 4 3.9 6.9 7.9 6.9h44.9c4.7 0 8.4-4.1 8-8.8-6.1-62.3-57.4-102.3-125.9-109.2V263c0-4.4-3.6-8-8-8h-28.1c-4.4 0-8 3.6-8 8v33c-70.8 6.9-126.2 46-126.2 119 0 67.6 49.8 100.2 102.1 112.7l24.7 6.3v142.7c-44.2-5.9-69-29.5-74.1-61.3-.6-3.8-4-6.6-7.9-6.6H363c-4.7 0-8.4 4-8 8.7 4.5 55 46.2 105.6 135.2 112.1V761c0 4.4 3.6 8 8 8h28.4c4.4 0 8-3.6 8-8.1l-.2-31.7c78.3-6.9 134.3-48.8 134.3-124-.1-69.4-44.2-100.4-109-116.4zm-68.6-16.2c-5.6-1.6-10.3-3.1-15-5-33.8-12.2-49.5-31.9-49.5-57.3 0-36.3 27.5-57 64.5-61.7v124zM534.3 677V543.3c3.1.9 5.9 1.6 8.8 2.2 47.3 14.4 63.2 34.4 63.2 65.1 0 39.1-29.4 62.6-72 66.4z"
         />
       </svg>
     </span>
      Fiat Currency
   </h2>
   <div
     className="sc-iwsKbI dmHKdG"
   >
     <div
       className="ant-select select-after ant-select-single ant-select-show-arrow"
       onBlur={[Function]}
       onFocus={[Function]}
       onKeyDown={[Function]}
       onKeyUp={[Function]}
       onMouseDown={[Function]}
       style={
         Object {
           "width": "100%",
         }
       }
     >
       <div
         className="ant-select-selector"
         onClick={[Function]}
         onMouseDown={[Function]}
       >
         <span
           className="ant-select-selection-search"
         >
           <input
             aria-activedescendant="rc_select_TEST_OR_SSR_list_0"
             aria-autocomplete="list"
             aria-controls="rc_select_TEST_OR_SSR_list"
             aria-haspopup="listbox"
             aria-owns="rc_select_TEST_OR_SSR_list"
             autoComplete="off"
             className="ant-select-selection-search-input"
             id="rc_select_TEST_OR_SSR"
             onChange={[Function]}
             onCompositionEnd={[Function]}
             onCompositionStart={[Function]}
             onKeyDown={[Function]}
             onMouseDown={[Function]}
             onPaste={[Function]}
             readOnly={true}
             role="combobox"
             style={
               Object {
                 "opacity": 0,
               }
             }
             type="search"
             unselectable="on"
             value=""
           />
         </span>
         <span
           className="ant-select-selection-item"
           title="US Dollar ($)"
         >
           US Dollar ($)
         </span>
       </div>
       <span
         aria-hidden={true}
         className="ant-select-arrow"
         onMouseDown={[Function]}
         style={
           Object {
             "WebkitUserSelect": "none",
             "userSelect": "none",
           }
         }
         unselectable="on"
       >
         <span
           aria-label="down"
           className="anticon anticon-down ant-select-suffix"
           role="img"
         >
           <svg
             aria-hidden="true"
             data-icon="down"
             fill="currentColor"
             focusable="false"
             height="1em"
             viewBox="64 64 896 896"
             width="1em"
           >
             <path
               d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"
             />
           </svg>
         </span>
       </span>
     </div>
   </div>
   <div
-    className="sc-kkGfuU lbBTMM"
+    className="sc-iAyFgw AbOBK"
   />
   [
   <a
     className="sc-dxgOiQ jbuVAx"
     href="https://docs.cashtabapp.com/docs/"
     rel="noreferrer"
     target="_blank"
     type="link"
   >
     Documentation
   </a>
   ]
 </div>
 `;
 
 exports[`Configure without a wallet 1`] = `
 <div
-  className="sc-kEYyzF jqzglm"
+  className="sc-kkGfuU liSflp"
 >
   <h2>
     <span
       aria-label="copy"
       className="anticon anticon-copy sc-bdVaJa loPqmo"
       role="img"
     >
       <svg
         aria-hidden="true"
         data-icon="copy"
         fill="currentColor"
         focusable="false"
         height="1em"
         viewBox="64 64 896 896"
         width="1em"
       >
         <path
           d="M832 64H296c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h496v688c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8V96c0-17.7-14.3-32-32-32zM704 192H192c-17.7 0-32 14.3-32 32v530.7c0 8.5 3.4 16.6 9.4 22.6l173.3 173.3c2.2 2.2 4.7 4 7.4 5.5v1.9h4.2c3.5 1.3 7.2 2 11 2H704c17.7 0 32-14.3 32-32V224c0-17.7-14.3-32-32-32zM350 856.2L263.9 770H350v86.2zM664 888H414V746c0-22.1-17.9-40-40-40H232V264h432v624z"
         />
       </svg>
     </span>
      Backup your wallet
   </h2>
   <div
     className="ant-alert ant-alert-warning ant-alert-with-description"
     data-show={true}
     role="alert"
     style={
       Object {
         "marginBottom": "12px",
       }
     }
   >
     <span
       aria-label="exclamation-circle"
       className="anticon anticon-exclamation-circle ant-alert-icon"
       role="img"
     >
       <svg
         aria-hidden="true"
         data-icon="exclamation-circle"
         fill="currentColor"
         focusable="false"
         height="1em"
         viewBox="64 64 896 896"
         width="1em"
       >
         <path
           d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"
         />
         <path
           d="M464 688a48 48 0 1096 0 48 48 0 10-96 0zm24-112h48c4.4 0 8-3.6 8-8V296c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v272c0 4.4 3.6 8 8 8z"
         />
       </svg>
     </span>
     <div
       className="ant-alert-content"
     >
       <div
         className="ant-alert-message"
       />
       <div
         className="ant-alert-description"
       >
         Your seed phrase is the only way to restore your wallet. Write it down. Keep it safe.
       </div>
     </div>
   </div>
   <div
-    className="sc-kkGfuU lbBTMM"
+    className="sc-iAyFgw AbOBK"
   />
   <h2>
     <span
       aria-label="wallet"
       className="anticon anticon-wallet sc-htpNat fLtATP"
       role="img"
     >
       <svg
         aria-hidden="true"
         data-icon="wallet"
         fill="currentColor"
         focusable="false"
         height="1em"
         viewBox="64 64 896 896"
         width="1em"
       >
         <path
           d="M880 112H144c-17.7 0-32 14.3-32 32v736c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V144c0-17.7-14.3-32-32-32zm-40 464H528V448h312v128zm0 264H184V184h656v200H496c-17.7 0-32 14.3-32 32v192c0 17.7 14.3 32 32 32h344v200zM580 512a40 40 0 1080 0 40 40 0 10-80 0z"
         />
       </svg>
     </span>
      Manage Wallets
   </h2>
   <button
     className="sc-VigVT RpRhe"
     onClick={[Function]}
   >
     <span
       aria-label="plus-square"
       className="anticon anticon-plus-square"
       role="img"
     >
       <svg
         aria-hidden="true"
         data-icon="plus-square"
         fill="currentColor"
         focusable="false"
         height="1em"
         viewBox="64 64 896 896"
         width="1em"
       >
         <path
           d="M328 544h152v152c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V544h152c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8H544V328c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v152H328c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8z"
         />
         <path
           d="M880 112H144c-17.7 0-32 14.3-32 32v736c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V144c0-17.7-14.3-32-32-32zm-40 728H184V184h656v656z"
         />
       </svg>
     </span>
      New Wallet
   </button>
   <button
     className="sc-jTzLTM bLkbAy"
     onClick={[Function]}
   >
     <span
       aria-label="import"
       className="anticon anticon-import"
       role="img"
     >
       <svg
         aria-hidden="true"
         data-icon="import"
         fill="currentColor"
         focusable="false"
         height="1em"
         viewBox="64 64 896 896"
         width="1em"
       >
         <path
           d="M888.3 757.4h-53.8c-4.2 0-7.7 3.5-7.7 7.7v61.8H197.1V197.1h629.8v61.8c0 4.2 3.5 7.7 7.7 7.7h53.8c4.2 0 7.7-3.4 7.7-7.7V158.7c0-17-13.7-30.7-30.7-30.7H158.7c-17 0-30.7 13.7-30.7 30.7v706.6c0 17 13.7 30.7 30.7 30.7h706.6c17 0 30.7-13.7 30.7-30.7V765.1c0-4.3-3.5-7.7-7.7-7.7zM902 476H588v-76c0-6.7-7.8-10.5-13-6.3l-141.9 112a8 8 0 000 12.6l141.9 112c5.3 4.2 13 .4 13-6.3v-76h314c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8z"
         />
       </svg>
     </span>
      Import Wallet
   </button>
   <div
-    className="sc-kkGfuU lbBTMM"
+    className="sc-iAyFgw AbOBK"
   />
   <h2>
     <span
       aria-label="dollar"
       className="anticon anticon-dollar sc-bwzfXH iTQEyo"
       role="img"
     >
       <svg
         aria-hidden="true"
         data-icon="dollar"
         fill="currentColor"
         focusable="false"
         height="1em"
         viewBox="64 64 896 896"
         width="1em"
       >
         <path
           d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372zm47.7-395.2l-25.4-5.9V348.6c38 5.2 61.5 29 65.5 58.2.5 4 3.9 6.9 7.9 6.9h44.9c4.7 0 8.4-4.1 8-8.8-6.1-62.3-57.4-102.3-125.9-109.2V263c0-4.4-3.6-8-8-8h-28.1c-4.4 0-8 3.6-8 8v33c-70.8 6.9-126.2 46-126.2 119 0 67.6 49.8 100.2 102.1 112.7l24.7 6.3v142.7c-44.2-5.9-69-29.5-74.1-61.3-.6-3.8-4-6.6-7.9-6.6H363c-4.7 0-8.4 4-8 8.7 4.5 55 46.2 105.6 135.2 112.1V761c0 4.4 3.6 8 8 8h28.4c4.4 0 8-3.6 8-8.1l-.2-31.7c78.3-6.9 134.3-48.8 134.3-124-.1-69.4-44.2-100.4-109-116.4zm-68.6-16.2c-5.6-1.6-10.3-3.1-15-5-33.8-12.2-49.5-31.9-49.5-57.3 0-36.3 27.5-57 64.5-61.7v124zM534.3 677V543.3c3.1.9 5.9 1.6 8.8 2.2 47.3 14.4 63.2 34.4 63.2 65.1 0 39.1-29.4 62.6-72 66.4z"
         />
       </svg>
     </span>
      Fiat Currency
   </h2>
   <div
     className="sc-iwsKbI dmHKdG"
   >
     <div
       className="ant-select select-after ant-select-single ant-select-show-arrow"
       onBlur={[Function]}
       onFocus={[Function]}
       onKeyDown={[Function]}
       onKeyUp={[Function]}
       onMouseDown={[Function]}
       style={
         Object {
           "width": "100%",
         }
       }
     >
       <div
         className="ant-select-selector"
         onClick={[Function]}
         onMouseDown={[Function]}
       >
         <span
           className="ant-select-selection-search"
         >
           <input
             aria-activedescendant="rc_select_TEST_OR_SSR_list_0"
             aria-autocomplete="list"
             aria-controls="rc_select_TEST_OR_SSR_list"
             aria-haspopup="listbox"
             aria-owns="rc_select_TEST_OR_SSR_list"
             autoComplete="off"
             className="ant-select-selection-search-input"
             id="rc_select_TEST_OR_SSR"
             onChange={[Function]}
             onCompositionEnd={[Function]}
             onCompositionStart={[Function]}
             onKeyDown={[Function]}
             onMouseDown={[Function]}
             onPaste={[Function]}
             readOnly={true}
             role="combobox"
             style={
               Object {
                 "opacity": 0,
               }
             }
             type="search"
             unselectable="on"
             value=""
           />
         </span>
         <span
           className="ant-select-selection-item"
           title="US Dollar ($)"
         >
           US Dollar ($)
         </span>
       </div>
       <span
         aria-hidden={true}
         className="ant-select-arrow"
         onMouseDown={[Function]}
         style={
           Object {
             "WebkitUserSelect": "none",
             "userSelect": "none",
           }
         }
         unselectable="on"
       >
         <span
           aria-label="down"
           className="anticon anticon-down ant-select-suffix"
           role="img"
         >
           <svg
             aria-hidden="true"
             data-icon="down"
             fill="currentColor"
             focusable="false"
             height="1em"
             viewBox="64 64 896 896"
             width="1em"
           >
             <path
               d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"
             />
           </svg>
         </span>
       </span>
     </div>
   </div>
   <div
-    className="sc-kkGfuU lbBTMM"
+    className="sc-iAyFgw AbOBK"
   />
   [
   <a
     className="sc-dxgOiQ jbuVAx"
     href="https://docs.cashtabapp.com/docs/"
     rel="noreferrer"
     target="_blank"
     type="link"
   >
     Documentation
   </a>
   ]
 </div>
 `;
diff --git a/web/cashtab/src/utils/__tests__/validation.test.js b/web/cashtab/src/utils/__tests__/validation.test.js
index 6f4589c63..f251bafdf 100644
--- a/web/cashtab/src/utils/__tests__/validation.test.js
+++ b/web/cashtab/src/utils/__tests__/validation.test.js
@@ -1,228 +1,263 @@
 import {
     shouldRejectAmountInput,
     fiatToCrypto,
     isValidTokenName,
     isValidTokenTicker,
     isValidTokenDecimals,
     isValidTokenInitialQty,
     isValidTokenDocumentUrl,
     isValidTokenStats,
     isValidCashtabSettings,
+    formatSavedBalance,
 } from '../validation';
 import { currency } from '@components/Common/Ticker.js';
 import { fromSmallestDenomination } from '@utils/cashMethods';
 import {
     stStatsValid,
     noCovidStatsValid,
     noCovidStatsInvalid,
     cGenStatsValid,
 } from '../__mocks__/mockTokenStats';
 
 describe('Validation utils', () => {
     it(`Returns 'false' if ${currency.ticker} send amount is a valid send amount`, () => {
         expect(shouldRejectAmountInput('10', currency.ticker, 20.0, 300)).toBe(
             false,
         );
     });
     it(`Returns 'false' if ${currency.ticker} send amount is a valid send amount in USD`, () => {
         // Here, user is trying to send $170 USD, where 1 BCHA = $20 USD, and the user has a balance of 15 BCHA or $300
         expect(shouldRejectAmountInput('170', 'USD', 20.0, 15)).toBe(false);
     });
     it(`Returns not a number if ${currency.ticker} send amount is not a number`, () => {
         const expectedValidationError = `Amount must be a number`;
         expect(
             shouldRejectAmountInput('Not a number', currency.ticker, 20.0, 3),
         ).toBe(expectedValidationError);
     });
     it(`Returns amount must be greater than 0 if ${currency.ticker} send amount is 0`, () => {
         const expectedValidationError = `Amount must be greater than 0`;
         expect(shouldRejectAmountInput('0', currency.ticker, 20.0, 3)).toBe(
             expectedValidationError,
         );
     });
     it(`Returns amount must be greater than 0 if ${currency.ticker} send amount is less than 0`, () => {
         const expectedValidationError = `Amount must be greater than 0`;
         expect(
             shouldRejectAmountInput('-0.031', currency.ticker, 20.0, 3),
         ).toBe(expectedValidationError);
     });
     it(`Returns balance error if ${currency.ticker} send amount is greater than user balance`, () => {
         const expectedValidationError = `Amount cannot exceed your ${currency.ticker} balance`;
         expect(shouldRejectAmountInput('17', currency.ticker, 20.0, 3)).toBe(
             expectedValidationError,
         );
     });
     it(`Returns balance error if ${currency.ticker} send amount is greater than user balance`, () => {
         const expectedValidationError = `Amount cannot exceed your ${currency.ticker} balance`;
         expect(shouldRejectAmountInput('17', currency.ticker, 20.0, 3)).toBe(
             expectedValidationError,
         );
     });
     it(`Returns error if ${
         currency.ticker
     } send amount is less than ${fromSmallestDenomination(
         currency.dustSats,
     ).toString()} minimum`, () => {
         const expectedValidationError = `Send amount must be at least ${fromSmallestDenomination(
             currency.dustSats,
         ).toString()} ${currency.ticker}`;
         expect(
             shouldRejectAmountInput(
                 (
                     fromSmallestDenomination(currency.dustSats).toString() -
                     0.00000001
                 ).toString(),
                 currency.ticker,
                 20.0,
                 3,
             ),
         ).toBe(expectedValidationError);
     });
     it(`Returns error if ${
         currency.ticker
     } send amount is less than ${fromSmallestDenomination(
         currency.dustSats,
     ).toString()} minimum in fiat currency`, () => {
         const expectedValidationError = `Send amount must be at least ${fromSmallestDenomination(
             currency.dustSats,
         ).toString()} ${currency.ticker}`;
         expect(
             shouldRejectAmountInput('0.0000005', 'USD', 0.00005, 1000000),
         ).toBe(expectedValidationError);
     });
     it(`Returns balance error if ${currency.ticker} send amount is greater than user balance with fiat currency selected`, () => {
         const expectedValidationError = `Amount cannot exceed your ${currency.ticker} balance`;
         // Here, user is trying to send $170 USD, where 1 BCHA = $20 USD, and the user has a balance of 5 BCHA or $100
         expect(shouldRejectAmountInput('170', 'USD', 20.0, 5)).toBe(
             expectedValidationError,
         );
     });
     it(`Returns precision error if ${currency.ticker} send amount has more than ${currency.cashDecimals} decimal places`, () => {
         const expectedValidationError = `${currency.ticker} transactions do not support more than ${currency.cashDecimals} decimal places`;
         expect(
             shouldRejectAmountInput('17.123456789', currency.ticker, 20.0, 35),
         ).toBe(expectedValidationError);
     });
     it(`Returns expected crypto amount with ${currency.cashDecimals} decimals of precision even if inputs have higher precision`, () => {
         expect(fiatToCrypto('10.97231694823432', 20.3231342349234234, 8)).toBe(
             '0.53989295',
         );
     });
     it(`Returns expected crypto amount with ${currency.cashDecimals} decimals of precision even if inputs have higher precision`, () => {
         expect(fiatToCrypto('10.97231694823432', 20.3231342349234234, 2)).toBe(
             '0.54',
         );
     });
     it(`Returns expected crypto amount with ${currency.cashDecimals} decimals of precision even if inputs have lower precision`, () => {
         expect(fiatToCrypto('10.94', 10, 8)).toBe('1.09400000');
     });
     it(`Accepts a valid ${currency.tokenTicker} token name`, () => {
         expect(isValidTokenName('Valid token name')).toBe(true);
     });
     it(`Accepts a valid ${currency.tokenTicker} token name that is a stringified number`, () => {
         expect(isValidTokenName('123456789')).toBe(true);
     });
     it(`Rejects ${currency.tokenTicker} token name if longer than 68 characters`, () => {
         expect(
             isValidTokenName(
                 'This token name is not valid because it is longer than 68 characters which is really pretty long for a token name when you think about it and all',
             ),
         ).toBe(false);
     });
     it(`Rejects ${currency.tokenTicker} token name if empty string`, () => {
         expect(isValidTokenName('')).toBe(false);
     });
     it(`Accepts a 4-char ${currency.tokenTicker} token ticker`, () => {
         expect(isValidTokenTicker('DOGE')).toBe(true);
     });
     it(`Accepts a 12-char ${currency.tokenTicker} token ticker`, () => {
         expect(isValidTokenTicker('123456789123')).toBe(true);
     });
     it(`Rejects ${currency.tokenTicker} token ticker if empty string`, () => {
         expect(isValidTokenTicker('')).toBe(false);
     });
     it(`Rejects ${currency.tokenTicker} token ticker if > 12 chars`, () => {
         expect(isValidTokenTicker('1234567891234')).toBe(false);
     });
     it(`Accepts ${currency.tokenDecimals} if zero`, () => {
         expect(isValidTokenDecimals('0')).toBe(true);
     });
     it(`Accepts ${currency.tokenDecimals} if between 0 and 9 inclusive`, () => {
         expect(isValidTokenDecimals('9')).toBe(true);
     });
     it(`Rejects ${currency.tokenDecimals} if empty string`, () => {
         expect(isValidTokenDecimals('')).toBe(false);
     });
     it(`Rejects ${currency.tokenDecimals} if non-integer`, () => {
         expect(isValidTokenDecimals('1.7')).toBe(false);
     });
     it(`Accepts ${currency.tokenDecimals} initial genesis quantity at minimum amount for 3 decimal places`, () => {
         expect(isValidTokenInitialQty('0.001', '3')).toBe(true);
     });
     it(`Accepts ${currency.tokenDecimals} initial genesis quantity at minimum amount for 9 decimal places`, () => {
         expect(isValidTokenInitialQty('0.000000001', '9')).toBe(true);
     });
     it(`Accepts ${currency.tokenDecimals} initial genesis quantity at amount below 100 billion`, () => {
         expect(isValidTokenInitialQty('1000', '0')).toBe(true);
     });
     it(`Accepts highest possible ${currency.tokenDecimals} initial genesis quantity at amount below 100 billion`, () => {
         expect(isValidTokenInitialQty('99999999999.999999999', '9')).toBe(true);
     });
     it(`Accepts ${currency.tokenDecimals} initial genesis quantity if decimal places equal tokenDecimals`, () => {
         expect(isValidTokenInitialQty('0.123', '3')).toBe(true);
     });
     it(`Accepts ${currency.tokenDecimals} initial genesis quantity if decimal places are less than tokenDecimals`, () => {
         expect(isValidTokenInitialQty('0.12345', '9')).toBe(true);
     });
     it(`Rejects ${currency.tokenDecimals} initial genesis quantity of zero`, () => {
         expect(isValidTokenInitialQty('0', '9')).toBe(false);
     });
     it(`Rejects ${currency.tokenDecimals} initial genesis quantity if tokenDecimals is not valid`, () => {
         expect(isValidTokenInitialQty('0', '')).toBe(false);
     });
     it(`Rejects ${currency.tokenDecimals} initial genesis quantity if 100 billion or higher`, () => {
         expect(isValidTokenInitialQty('100000000000', '0')).toBe(false);
     });
     it(`Rejects ${currency.tokenDecimals} initial genesis quantity if it has more decimal places than tokenDecimals`, () => {
         expect(isValidTokenInitialQty('1.5', '0')).toBe(false);
     });
     it(`Accepts a valid ${currency.tokenTicker} token document URL`, () => {
         expect(isValidTokenDocumentUrl('cashtabapp.com')).toBe(true);
     });
     it(`Accepts a valid ${currency.tokenTicker} token document URL including special URL characters`, () => {
         expect(isValidTokenDocumentUrl('https://cashtabapp.com/')).toBe(true);
     });
     it(`Accepts a blank string as a valid ${currency.tokenTicker} token document URL`, () => {
         expect(isValidTokenDocumentUrl('')).toBe(true);
     });
     it(`Rejects ${currency.tokenTicker} token name if longer than 68 characters`, () => {
         expect(
             isValidTokenDocumentUrl(
                 'http://www.ThisTokenDocumentUrlIsActuallyMuchMuchMuchMuchMuchMuchMuchMuchMuchMuchMuchMuchMuchMuchMuchMuchMuchMuchTooLong.com/',
             ),
         ).toBe(false);
     });
     it(`Correctly validates token stats for token created before the ${currency.ticker} fork`, () => {
         expect(isValidTokenStats(stStatsValid)).toBe(true);
     });
     it(`Correctly validates token stats for token created after the ${currency.ticker} fork`, () => {
         expect(isValidTokenStats(noCovidStatsValid)).toBe(true);
     });
     it(`Correctly validates token stats for token with no minting baton`, () => {
         expect(isValidTokenStats(cGenStatsValid)).toBe(true);
     });
     it(`Recognizes a token stats object with missing required keys as invalid`, () => {
         expect(isValidTokenStats(noCovidStatsInvalid)).toBe(false);
     });
     it(`Recognizes a valid cashtab settings object`, () => {
         expect(isValidCashtabSettings({ fiatCurrency: 'usd' })).toBe(true);
     });
     it(`Rejects a cashtab settings object for an unsupported currency`, () => {
         expect(isValidCashtabSettings({ fiatCurrency: 'xau' })).toBe(false);
     });
     it(`Rejects a corrupted cashtab settings object for an unsupported currency`, () => {
         expect(isValidCashtabSettings({ fiatCurrencyWrongLabel: 'usd' })).toBe(
             false,
         );
     });
+    it(`test formatSavedBalance with zero XEC balance input`, () => {
+        expect(formatSavedBalance('0', 'en-US')).toBe('0');
+    });
+    it(`test formatSavedBalance with a small XEC balance input with 2+ decimal figures`, () => {
+        expect(formatSavedBalance('1574.5445', 'en-US')).toBe('1,574.54');
+    });
+    it(`test formatSavedBalance with 1 Million XEC balance input`, () => {
+        expect(formatSavedBalance('1000000', 'en-US')).toBe('1,000,000');
+    });
+    it(`test formatSavedBalance with 1 Billion XEC balance input`, () => {
+        expect(formatSavedBalance('1000000000', 'en-US')).toBe('1,000,000,000');
+    });
+    it(`test formatSavedBalance with total supply as XEC balance input`, () => {
+        expect(formatSavedBalance('21000000000000', 'en-US')).toBe(
+            '21,000,000,000,000',
+        );
+    });
+    it(`test formatSavedBalance with > total supply as XEC balance input`, () => {
+        expect(formatSavedBalance('31000000000000', 'en-US')).toBe(
+            '31,000,000,000,000',
+        );
+    });
+    it(`test formatSavedBalance with no balance`, () => {
+        expect(formatSavedBalance('', 'en-US')).toBe('0');
+    });
+    it(`test formatSavedBalance with null input`, () => {
+        expect(formatSavedBalance(null, 'en-US')).toBe('0');
+    });
+    it(`test formatSavedBalance with undefined sw.state.balance or sw.state.balance.totalBalance as input`, () => {
+        expect(formatSavedBalance(undefined, 'en-US')).toBe('N/A');
+    });
+    it(`test formatSavedBalance with non-numeric input`, () => {
+        expect(formatSavedBalance('CainBCHA', 'en-US')).toBe('NaN');
+    });
 });
diff --git a/web/cashtab/src/utils/validation.js b/web/cashtab/src/utils/validation.js
index 646eeb1e9..cb037a1b6 100644
--- a/web/cashtab/src/utils/validation.js
+++ b/web/cashtab/src/utils/validation.js
@@ -1,121 +1,141 @@
 import BigNumber from 'bignumber.js';
 import { currency } from '@components/Common/Ticker.js';
 import { fromSmallestDenomination } from '@utils/cashMethods';
 
 // Validate cash amount
 export const shouldRejectAmountInput = (
     cashAmount,
     selectedCurrency,
     fiatPrice,
     totalCashBalance,
 ) => {
     // Take cashAmount as input, a string from form input
     let error = false;
     let testedAmount = new BigNumber(cashAmount);
 
     if (selectedCurrency !== currency.ticker) {
         // Ensure no more than currency.cashDecimals decimal places
         testedAmount = new BigNumber(fiatToCrypto(cashAmount, fiatPrice));
     }
 
     // Validate value for > 0
     if (isNaN(testedAmount)) {
         error = 'Amount must be a number';
     } else if (testedAmount.lte(0)) {
         error = 'Amount must be greater than 0';
     } else if (
         testedAmount.lt(fromSmallestDenomination(currency.dustSats).toString())
     ) {
         error = `Send amount must be at least ${fromSmallestDenomination(
             currency.dustSats,
         ).toString()} ${currency.ticker}`;
     } else if (testedAmount.gt(totalCashBalance)) {
         error = `Amount cannot exceed your ${currency.ticker} balance`;
     } else if (!isNaN(testedAmount) && testedAmount.toString().includes('.')) {
         if (
             testedAmount.toString().split('.')[1].length > currency.cashDecimals
         ) {
             error = `${currency.ticker} transactions do not support more than ${currency.cashDecimals} decimal places`;
         }
     }
     // return false if no error, or string error msg if error
     return error;
 };
 
 export const fiatToCrypto = (
     fiatAmount,
     fiatPrice,
     cashDecimals = currency.cashDecimals,
 ) => {
     let cryptoAmount = new BigNumber(fiatAmount)
         .div(new BigNumber(fiatPrice))
         .toFixed(cashDecimals);
     return cryptoAmount;
 };
 
 export const isValidTokenName = tokenName => {
     return (
         typeof tokenName === 'string' &&
         tokenName.length > 0 &&
         tokenName.length < 68
     );
 };
 
 export const isValidTokenTicker = tokenTicker => {
     return (
         typeof tokenTicker === 'string' &&
         tokenTicker.length > 0 &&
         tokenTicker.length < 13
     );
 };
 
 export const isValidTokenDecimals = tokenDecimals => {
     return ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'].includes(
         tokenDecimals,
     );
 };
 
 export const isValidTokenInitialQty = (tokenInitialQty, tokenDecimals) => {
     const minimumQty = new BigNumber(1 / 10 ** tokenDecimals);
     const tokenIntialQtyBig = new BigNumber(tokenInitialQty);
     return (
         tokenIntialQtyBig.gte(minimumQty) &&
         tokenIntialQtyBig.lt(100000000000) &&
         tokenIntialQtyBig.dp() <= tokenDecimals
     );
 };
 
 export const isValidTokenDocumentUrl = tokenDocumentUrl => {
     return (
         typeof tokenDocumentUrl === 'string' &&
         tokenDocumentUrl.length >= 0 &&
         tokenDocumentUrl.length < 68
     );
 };
 
 export const isValidTokenStats = tokenStats => {
     return (
         typeof tokenStats === 'object' &&
         'timestampUnix' in tokenStats &&
         'documentUri' in tokenStats &&
         'containsBaton' in tokenStats &&
         'initialTokenQty' in tokenStats &&
         'totalMinted' in tokenStats &&
         'totalBurned' in tokenStats &&
         'circulatingSupply' in tokenStats
     );
 };
 
 export const isValidCashtabSettings = settings => {
     try {
         const isValid =
             typeof settings === 'object' &&
             Object.prototype.hasOwnProperty.call(settings, 'fiatCurrency') &&
             currency.settingsValidation.fiatCurrency.includes(
                 settings.fiatCurrency,
             );
         return isValid;
     } catch (err) {
         return false;
     }
 };
+
+export const formatSavedBalance = (swBalance, optionalLocale) => {
+    try {
+        if (swBalance === undefined) {
+            return 'N/A';
+        } else {
+            if (optionalLocale === undefined) {
+                return new Number(swBalance).toLocaleString({
+                    maximumFractionDigits: currency.cashDecimals,
+                });
+            } else {
+                return new Number(swBalance).toLocaleString(optionalLocale, {
+                    maximumFractionDigits: currency.cashDecimals,
+                });
+            }
+        }
+    } catch (err) {
+        return 'N/A';
+    }
+};