Code Formatting Cleanup

app/ts/background/accessManagement.ts

@@ -110,7 +110,7 @@ function getAddressesThatDoNotNeedIndividualAccesses(activeAddressEntries: Addre
 export async function setInterceptorDisabledForWebsite(website: Website, interceptorDisabled: boolean) {
 	return await updateWebsiteAccess((previousWebsiteAccess) => {
 		const index = previousWebsiteAccess.findIndex((entry) => entry.website.websiteOrigin === website.websiteOrigin)
-		const previousAccess = index !== -1 ? previousWebsiteAccess[index] : undefined;
+		const previousAccess = index !== -1 ? previousWebsiteAccess[index] : undefined
 		if (previousAccess === undefined) return [...previousWebsiteAccess, { website, addressAccess: [], interceptorDisabled } ]
 		return replaceElementInReadonlyArray(previousWebsiteAccess, index, { ...previousAccess, interceptorDisabled })
 	})

app/ts/background/background.ts

@@ -365,10 +365,10 @@ export async function refreshConfirmTransactionSimulation(
 							...transactionToSimulate.transaction,
 							nonce: lastNonceFixed.preSimulationTransaction.signedTransaction.nonce,
 						} }
-					: { error: {
-						...transactionToSimulate.error,
-						decodedErrorMessage: decodeEthereumError(availableAbis, transactionToSimulate.error).reason
-					} }
+						: { error: {
+							...transactionToSimulate.error,
+							decodedErrorMessage: decodeEthereumError(availableAbis, transactionToSimulate.error).reason
+						} }
 				}
 			}
 		}

app/ts/background/iconHandler.ts

@@ -36,7 +36,7 @@ export async function updateExtensionIcon(websiteTabConnections: WebsiteTabConne
 		return setIcon(ICON_ACCESS_DENIED, `The access to ${ activeAddress.name } for ${ websiteOrigin } has been DENIED!`)
 	}
 	if (settings.simulationMode) return setIcon(ICON_SIMULATING, 'The Interceptor simulates your sent transactions.')
-	if (settings.currentRpcNetwork.httpsRpc === undefined) return setIcon(ICON_SIGNING_NOT_SUPPORTED, `The Interceptor is disabled while it's on an unsupported network`)
+	if (settings.currentRpcNetwork.httpsRpc === undefined) return setIcon(ICON_SIGNING_NOT_SUPPORTED, 'The Interceptor is disabled while it\'s on an unsupported network')
 	const tabState = await getTabState(tabId)
 	return setIcon(ICON_SIGNING, `The Interceptor forwards your transactions to ${ getPrettySignerName(tabState.signerName) } once sent.`)
 }

app/ts/background/messageSending.ts

@@ -1,8 +1,8 @@
-import { InterceptedRequestForward, InterceptorMessageToInpage, SubscriptionReplyOrCallBack } from "../types/interceptor-messages.js"
-import { WebsiteSocket, checkAndPrintRuntimeLastError } from "../utils/requests.js"
-import { WebsiteTabConnections } from "../types/user-interface-types.js"
-import { websiteSocketToString } from "./backgroundUtils.js"
-import { serialize } from "../types/wire-types.js"
+import { InterceptedRequestForward, InterceptorMessageToInpage, SubscriptionReplyOrCallBack } from '../types/interceptor-messages.js'
+import { WebsiteSocket, checkAndPrintRuntimeLastError } from '../utils/requests.js'
+import { WebsiteTabConnections } from '../types/user-interface-types.js'
+import { websiteSocketToString } from './backgroundUtils.js'
+import { serialize } from '../types/wire-types.js'
 
 function postMessageToPortIfConnected(port: browser.runtime.Port, message: InterceptorMessageToInpage) {
 	try {

app/ts/background/sleeping.ts

@@ -1,10 +1,10 @@
-import { EthereumClientService } from "../simulation/services/EthereumClientService.js"
-import { TIME_BETWEEN_BLOCKS } from "../utils/constants.js"
-import { modifyObject } from "../utils/typescript.js"
-import { sendPopupMessageToOpenWindows } from "./backgroundUtils.js"
-import { updateExtensionBadge } from "./iconHandler.js"
-import { getInterceptorStartSleepingTimestamp, getRpcConnectionStatus, setInterceptorStartSleepingTimestamp, setRpcConnectionStatus } from "./storageVariables.js"
-import { isConfirmTransactionFocused } from "./windows/confirmTransaction.js"
+import { EthereumClientService } from '../simulation/services/EthereumClientService.js'
+import { TIME_BETWEEN_BLOCKS } from '../utils/constants.js'
+import { modifyObject } from '../utils/typescript.js'
+import { sendPopupMessageToOpenWindows } from './backgroundUtils.js'
+import { updateExtensionBadge } from './iconHandler.js'
+import { getInterceptorStartSleepingTimestamp, getRpcConnectionStatus, setInterceptorStartSleepingTimestamp, setRpcConnectionStatus } from './storageVariables.js'
+import { isConfirmTransactionFocused } from './windows/confirmTransaction.js'
 
 const updateConnectionStatusRetry = async (ethereumClientService: EthereumClientService) => {
 	const status = await getRpcConnectionStatus()

app/ts/background/windows/personalSign.ts

@@ -19,7 +19,7 @@ async function addMetadataToOpenSeaOrder(ethereumClientService: EthereumClientSe
 		offerer: await identifyAddress(ethereumClientService, requestAbortController, openSeaOrder.offerer),
 		offer: await Promise.all(openSeaOrder.offer.map( async (offer) => ({ ...offer, token: await identifyAddress(ethereumClientService, requestAbortController, offer.token) }))),
 		consideration: await Promise.all(openSeaOrder.consideration.map(async (offer) => ({ ...offer, token: await identifyAddress(ethereumClientService, requestAbortController, offer.token), recipient: await identifyAddress(ethereumClientService, requestAbortController, offer.recipient) })))
-	 }
+	}
 }
 
 export async function craftPersonalSignPopupMessage(ethereumClientService: EthereumClientService, requestAbortController: AbortController | undefined, signedMessageTransaction: SignedMessageTransaction, rpcNetwork: RpcNetwork): Promise<VisualizedPersonalSignRequest> {

app/ts/components/App.tsx

@@ -52,12 +52,12 @@ export function NetworkErrors({ rpcConnectionStatus } : NetworkErrorParams) {
 			<ErrorComponent warning = { true } text = {
 				<>Unable to connect to { rpcConnectionStatus.rpcNetwork.name }. Retrying in <SomeTimeAgo priorTimestamp = { nextConnectionAttempt } countBackwards = { true }/> .</>
 			}/>
-		: <></> }
+			: <></> }
 		{ rpcConnectionStatus.latestBlock !== undefined && noNewBlockForOverTwoMins(rpcConnectionStatus) && rpcConnectionStatus.latestBlock !== null ?
 			<ErrorComponent warning = { true } text = {
 				<>The connected RPC ({ rpcConnectionStatus.rpcNetwork.name }) seem to be stuck at block { rpcConnectionStatus.latestBlock.number } (occured on: { humanReadableDate(rpcConnectionStatus.latestBlock.timestamp) }). Retrying in <SomeTimeAgo priorTimestamp = { nextConnectionAttempt } countBackwards = { true }/>.</>
 			}/>
-		: <></> }
+			: <></> }
 	</>
 }
 
@@ -366,7 +366,7 @@ export function App() {
 									close = { () => setAndSaveAppPage({ page: 'Home' }) }
 									editEnsNamedHashWindowState = { appPage.state }
 								/>
-							: <></> }
+								: <></> }
 							{ appPage.page === 'AccessList' ?
 								<InterceptorAccessList
 									setAndSaveAppPage = { setAndSaveAppPage }
@@ -375,7 +375,7 @@ export function App() {
 									websiteAccessAddressMetadata = { websiteAccessAddressMetadata }
 									renameAddressCallBack = { renameAddressCallBack }
 								/>
-							: <></> }
+								: <></> }
 							{ appPage.page === 'ChangeActiveAddress' ?
 								<ChangeActiveAddress
 									setActiveAddressAndInformAboutIt = { setActiveAddressAndInformAboutIt }
@@ -386,15 +386,15 @@ export function App() {
 									renameAddressCallBack = { renameAddressCallBack }
 									addNewAddress = { addNewAddress }
 								/>
-							: <></> }
+								: <></> }
 							{ appPage.page === 'AddNewAddress' || appPage.page === 'ModifyAddress' ?
 								<AddNewAddress
 									setActiveAddressAndInformAboutIt = { setActiveAddressAndInformAboutIt }
 									modifyAddressWindowState = { appPage.state }
 									close = { () => setAndSaveAppPage({ page: 'Home' }) }
 									activeAddress = { simulationMode ? activeSimulationAddress : activeSigningAddress }
 								/>
-							: <></> }
+								: <></> }
 						</div>
 					</> }
 				</div>

app/ts/components/pages/AddNewAddress.tsx

@@ -44,7 +44,7 @@ type NameInputParams = {
 
 function NameInput({ nameInput, setNameInput, disabled }: NameInputParams) {
 	const ref = createRef<HTMLInputElement>()
-    useEffect(() => { ref.current?.focus() }, [])
+	useEffect(() => { ref.current?.focus() }, [])
 	return <input
 		className = 'input title is-5 is-spaced'
 		type = 'text'
@@ -103,7 +103,7 @@ type AbiInputParams = {
 
 function AbiInput({ abiInput, setAbiInput, disabled }: AbiInputParams) {
 	const ref = createRef<HTMLInputElement>()
-    useEffect(() => { ref.current?.focus() }, [])
+	useEffect(() => { ref.current?.focus() }, [])
 	return <input
 		className = 'input is-spaced'
 		type = 'text'
@@ -232,7 +232,7 @@ export function AddNewAddress(param: AddAddressParam) {
 			askForAddressAccess: incompleteAddressBookEntry.askForAddressAccess,
 			entrySource: 'User' as const,
 		}
-		
+
 		switch(incompleteAddressBookEntry.type) {
 			case 'ERC721': {
 				if (incompleteAddressBookEntry.symbol === undefined) return undefined

app/ts/components/pages/ChangeActiveAddress.tsx

@@ -38,7 +38,7 @@ export function ChangeActiveAddress(param: ChangeActiveAddressParam) {
 				</div>
 				<div class = 'card-header-title'>
 					<p className = 'paragraph'>
-					Change Active Address
+						Change Active Address
 					</p>
 				</div>
 				<button class = 'card-header-icon' aria-label = 'close' onClick = { param.close }>

app/ts/components/pages/ChangeChain.tsx

@@ -73,14 +73,14 @@ export function ChangeChain() {
 							</p>
 							{ chainChangeData.rpcNetwork.httpsRpc === undefined && chainChangeData.simulationMode ?
 								<ErrorComponent text = { 'This chain is not supported by The Interceptor. If you want to use this chain anyway. Select Signing mode instead of Simulation mode and attempt to change the chain again. You will then be able to disable The Interceptor and send transactions without its protection.' }/>
-							: <></> }
+								: <></> }
 							{ chainChangeData.rpcNetwork.httpsRpc === undefined && !chainChangeData.simulationMode ?
 								<ErrorCheckBox
 									text = { 'This chain is not supported by The Interceptor. Would you like to disable The Interceptor and attempt to connect anyway?' }
 									checked = { connectAnyway }
 									onInput = { setConnectAnyway }
 								/>
-							: <></> }
+								: <></> }
 						</div>
 					</div>
 					<div style = 'overflow: auto; display: flex; justify-content: space-around; width: 100%; height: 40px;'>

app/ts/components/pages/ConfirmTransaction.tsx

@@ -98,7 +98,6 @@ const TransactionNames = (param: TransactionNamesParams) => {
 		const currentPendingTransactionOrSignableMessage = param.currentPendingTransaction
 		if (currentPendingTransactionOrSignableMessage === undefined) return 'Loading...'
 		if (currentPendingTransactionOrSignableMessage.transactionOrMessageCreationStatus !== 'Simulated') return currentPendingTransactionOrSignableMessage.transactionOrMessageCreationStatus
-		currentPendingTransactionOrSignableMessage.transactionOrMessageCreationStatus
 		if (currentPendingTransactionOrSignableMessage.type === 'SignableMessage') return identifySignature(currentPendingTransactionOrSignableMessage.visualizedPersonalSignRequest).title
 		if (currentPendingTransactionOrSignableMessage.simulationResults.statusCode === 'failed') return 'Failing transaction'
 		const lastTx = currentPendingTransactionOrSignableMessage.simulationResults.statusCode !== 'success' ? undefined : getResultsForTransaction(currentPendingTransactionOrSignableMessage.simulationResults.data.simulatedAndVisualizedTransactions, currentPendingTransactionOrSignableMessage.transactionIdentifier)
@@ -364,12 +363,12 @@ function Buttons({ currentPendingTransactionOrSignableMessage, reject, approve,
 		<button className = 'button is-primary button-overflow dialog-button-right' onClick = { approve } disabled = { confirmDisabled }>
 			{ currentPendingTransactionOrSignableMessage.approvalStatus.status === 'WaitingForSigner' ? <>
 				<span> <Spinner height = '1em' color = 'var(--text-color)' /> Waiting for <SignersLogoName signerName = { signerName } /> </span>
-				</> : <>
-					{ currentPendingTransactionOrSignableMessage.simulationMode
-						? `${ identified.simulationAction }!`
-						: <SignerLogoText signerName = { signerName } text = { identified.signingAction } />
-					}
-				</>
+			</> : <>
+				{ currentPendingTransactionOrSignableMessage.simulationMode
+					? `${ identified.simulationAction }!`
+					: <SignerLogoText signerName = { signerName } text = { identified.signingAction } />
+				}
+			</>
 			}
 		</button>
 	</div>
@@ -542,15 +541,15 @@ export function ConfirmTransaction() {
 								close = { () => { setModalState({ page: 'noModal' }) } }
 								editEnsNamedHashWindowState = { modalState.state }
 							/>
-						: <></> }
+							: <></> }
 						{ modalState.page === 'modifyAddress' ?
 							<AddNewAddress
 								setActiveAddressAndInformAboutIt = { undefined }
 								modifyAddressWindowState = { modalState.state }
 								close = { () => { setModalState({ page: 'noModal' }) } }
 								activeAddress = { currentPendingTransactionOrSignableMessage?.activeAddress }
 							/>
-						: <></> }
+							: <></> }
 					</div>
 					<div class = 'block popup-block popup-block-scroll' style = 'padding: 0px'>
 						<UnexpectedError close = { clearUnexpectedError } unexpectedError = { unexpectedError }/>
@@ -575,15 +574,15 @@ export function ConfirmTransaction() {
 							close = { () => { setModalState({ page: 'noModal' }) } }
 							editEnsNamedHashWindowState = { modalState.state }
 						/>
-					: <></> }
+						: <></> }
 					{ modalState.page === 'modifyAddress' ?
 						<AddNewAddress
 							setActiveAddressAndInformAboutIt = { undefined }
 							modifyAddressWindowState = { modalState.state }
 							close = { () => { setModalState({ page: 'noModal' }) } }
 							activeAddress = { currentPendingTransactionOrSignableMessage?.activeAddress }
 						/>
-					: <></> }
+						: <></> }
 				</div>
 				<div class = 'block popup-block popup-block-scroll' style = 'padding: 0px'>
 					<div style = 'position: sticky; top: 0; z-index:1'>
@@ -597,8 +596,8 @@ export function ConfirmTransaction() {
 							{ currentPendingTransactionOrSignableMessage.originalRequestParameters.method === 'eth_sendRawTransaction' && currentPendingTransactionOrSignableMessage.type === 'Transaction'
 								? <DinoSaysNotification
 									text = { `This transaction is signed already. No extra signing required to forward it to ${ currentPendingTransactionOrSignableMessage.transactionOrMessageCreationStatus !== 'Simulated' || currentPendingTransactionOrSignableMessage.simulationResults.statusCode === 'failed' ?
-									'network' :
-									currentPendingTransactionOrSignableMessage.simulationResults.data.simulationState.rpcNetwork.name }.` }
+										'network' :
+										currentPendingTransactionOrSignableMessage.simulationResults.data.simulationState.rpcNetwork.name }.` }
 									close = { () => setPendingTransactionAddedNotification(false)}
 								/>
 								: <></>
@@ -623,15 +622,15 @@ export function ConfirmTransaction() {
 									rpcConnectionStatus = { rpcConnectionStatus }
 									numberOfUnderTransactions = { underTransactions.length }
 								/>
-							: <>
-								<SignatureCard
-									visualizedPersonalSignRequest = { currentPendingTransactionOrSignableMessage.visualizedPersonalSignRequest }
-									renameAddressCallBack = { renameAddressCallBack }
-									removeTransactionOrSignedMessage = { undefined }
-									numberOfUnderTransactions = { underTransactions.length }
-									editEnsNamedHashCallBack = { editEnsNamedHashCallBack }
-								/>
-							</> }
+								: <>
+									<SignatureCard
+										visualizedPersonalSignRequest = { currentPendingTransactionOrSignableMessage.visualizedPersonalSignRequest }
+										renameAddressCallBack = { renameAddressCallBack }
+										removeTransactionOrSignedMessage = { undefined }
+										numberOfUnderTransactions = { underTransactions.length }
+										editEnsNamedHashCallBack = { editEnsNamedHashCallBack }
+									/>
+								</> }
 						</div>
 						<nav class = 'window-footer popup-button-row' style = 'position: sticky; bottom: 0; width: 100%;'>
 							<CheckBoxes currentPendingTransactionOrSignableMessage = { currentPendingTransactionOrSignableMessage } forceSend = { forceSend } setForceSend = { (enabled: boolean) => setForceSend(enabled) }/>

app/ts/components/pages/Home.tsx

@@ -170,28 +170,28 @@ function SimulationResults(param: SimulationStateParam) {
 		</div>
 		{ param.simulationAndVisualisationResults.simulatedAndVisualizedTransactions.length === 0 && param.simulationAndVisualisationResults.visualizedPersonalSignRequests.length === 0 ?
 			<div style = 'padding: 10px'><DinoSays text = { 'Give me some transactions to munch on!' } /></div>
-		: <>
-			<div class = { param.simulationResultState === 'invalid' || param.simulationUpdatingState === 'failed' ? 'blur' : '' }>
-				<TransactionsAndSignedMessages
-					simulationAndVisualisationResults = { param.simulationAndVisualisationResults }
-					removeTransactionOrSignedMessage = { param.removeTransactionOrSignedMessage }
-					activeAddress = { param.simulationAndVisualisationResults.activeAddress }
-					renameAddressCallBack = { param.renameAddressCallBack }
-					editEnsNamedHashCallBack = { param.editEnsNamedHashCallBack }
-					removedTransactionOrSignedMessages = { param.removedTransactionOrSignedMessages }
-					addressMetaData = { param.simulationAndVisualisationResults.addressBookEntries }
-				/>
-				{ param.removedTransactionOrSignedMessages.length > 0
-					? <></>
-					: <SimulationSummary
+			: <>
+				<div class = { param.simulationResultState === 'invalid' || param.simulationUpdatingState === 'failed' ? 'blur' : '' }>
+					<TransactionsAndSignedMessages
 						simulationAndVisualisationResults = { param.simulationAndVisualisationResults }
-						currentBlockNumber = { param.currentBlockNumber }
+						removeTransactionOrSignedMessage = { param.removeTransactionOrSignedMessage }
+						activeAddress = { param.simulationAndVisualisationResults.activeAddress }
 						renameAddressCallBack = { param.renameAddressCallBack }
-						rpcConnectionStatus = { param.rpcConnectionStatus }
+						editEnsNamedHashCallBack = { param.editEnsNamedHashCallBack }
+						removedTransactionOrSignedMessages = { param.removedTransactionOrSignedMessages }
+						addressMetaData = { param.simulationAndVisualisationResults.addressBookEntries }
 					/>
-				}
-			</div>
-		</> }
+					{ param.removedTransactionOrSignedMessages.length > 0
+						? <></>
+						: <SimulationSummary
+							simulationAndVisualisationResults = { param.simulationAndVisualisationResults }
+							currentBlockNumber = { param.currentBlockNumber }
+							renameAddressCallBack = { param.renameAddressCallBack }
+							rpcConnectionStatus = { param.rpcConnectionStatus }
+						/>
+					}
+				</div>
+			</> }
 		<div class = 'content' style = 'height: 0.1px'/>
 	</div>
 }
@@ -284,7 +284,7 @@ export function Home(param: HomeParams) {
 	return <>
 		{ rpcNetwork.httpsRpc === undefined ?
 			<ErrorComponent text = { `${ rpcNetwork.name } is not a supported network. The Interceptor is disabled while you are using ${ rpcNetwork.name }.` }/>
-		: <></> }
+			: <></> }
 
 		<FirstCard
 			activeAddresses = { activeAddresses }