Remove unused packages and wrap tx replacement in form (#1052)

* Use form onSubmit * Remove unused packages * linter fix * Update Send.test.tsx.snap * update dev dependencies * reinstall whatwg-fetch * Remove @cloudflare/wrangler package
glifio · Jun 16, 2022 · d5f0467 · d5f0467
1 parent df9ab10
commit d5f0467
Show file tree

Hide file tree

Showing 6 changed files with 1,041 additions and 1,578 deletions.
diff --git a/README.md b/README.md
@@ -57,11 +57,9 @@ Version **x.y.z**:
 A number of modules have been broken out into packages in this [modules repo](https://github.com/glifio/modules).
 
 - [Filecoin wallet provider](https://github.com/glifio/modules/tree/primary/packages/filecoin-wallet-provider)
-- [Filecoin jsonrpc client](https://github.com/glifio/modules/tree/primary/packages/filecoin-rpc-client)
 - [Filecoin number type](https://github.com/glifio/modules/tree/primary/packages/filecoin-number)
 - [Filecoin message type](https://github.com/glifio/modules/tree/primary/packages/filecoin-message)
 - [Filecoin address type](https://github.com/glifio/modules/tree/primary/packages/filecoin-address)
-- [Filecoin message confirmer](https://github.com/glifio/modules/tree/primary/packages/filecoin-message-confirmer)
 - [Filecoin react-components](https://github.com/glifio/modules/tree/primary/packages/react-components)
 
 #### Filecoin module package local development

diff --git a/__mocks__/dayjs.js b/__mocks__/dayjs.js
diff --git a/components/Wallet/Replace.tsx b/components/Wallet/Replace.tsx
@@ -125,31 +125,36 @@ export const Replace = ({ strategy }: ReplaceProps) => {
 
   return (
     <Dialog>
-      <Transaction.Header
-        txState={txState}
-        title={
-          strategy === ReplaceStrategy.SPEED_UP
-            ? 'Speed Up Message'
-            : 'Cancel Message'
-        }
-        description={'Please confirm the updated message details below'}
-        loginOption={loginOption as LoginOption}
-        errorMessage={
-          messageError?.message ||
-          gasParamsError?.message ||
-          minGasParamsError?.message ||
-          txError?.message ||
-          walletError() ||
-          ''
-        }
-      />
-      {txState !== TxState.LoadingMessage && (
-        <ShadowBox>
-          <Transaction.Balance
-            address={wallet.address}
-            balance={wallet.balance}
-          />
-          <form>
+      <form
+        onSubmit={(e) => {
+          e.preventDefault()
+          onSend()
+        }}
+      >
+        <Transaction.Header
+          txState={txState}
+          title={
+            strategy === ReplaceStrategy.SPEED_UP
+              ? 'Speed Up Message'
+              : 'Cancel Message'
+          }
+          description={'Please confirm the updated message details below'}
+          loginOption={loginOption as LoginOption}
+          errorMessage={
+            messageError?.message ||
+            gasParamsError?.message ||
+            minGasParamsError?.message ||
+            txError?.message ||
+            walletError() ||
+            ''
+          }
+        />
+        {txState !== TxState.LoadingMessage && (
+          <ShadowBox>
+            <Transaction.Balance
+              address={wallet.address}
+              balance={wallet.balance}
+            />
             <InputV2.Text label='Message CID' value={cid} disabled />
             <InputV2.Number label='Nonce' value={message.nonce} disabled />
             <InputV2.Filecoin
@@ -200,25 +205,24 @@ export const Replace = ({ strategy }: ReplaceProps) => {
               onChange={setExpert}
               disabled={txState !== TxState.FillingForm}
             />
-          </form>
-          {maxFee && (
-            <p>
-              You will not pay more than {maxFee.toFil()} FIL for this
-              transaction.{' '}
-              <SmartLink href='https://filfox.info/en/stats/gas'>
-                More information on average gas fee statistics.
-              </SmartLink>
-            </p>
-          )}
-        </ShadowBox>
-      )}
-      <Transaction.Buttons
-        backDisabled={txState !== TxState.FillingForm}
-        nextDisabled={txState !== TxState.FillingForm || !inputsValid}
-        backText='Cancel'
-        nextText='Send'
-        onClickNext={onSend}
-      />
+            {maxFee && (
+              <p>
+                You will not pay more than {maxFee.toFil()} FIL for this
+                transaction.{' '}
+                <SmartLink href='https://filfox.info/en/stats/gas'>
+                  More information on average gas fee statistics.
+                </SmartLink>
+              </p>
+            )}
+          </ShadowBox>
+        )}
+        <Transaction.Buttons
+          backDisabled={txState !== TxState.FillingForm}
+          nextDisabled={txState !== TxState.FillingForm || !inputsValid}
+          backText='Cancel'
+          nextText='Send'
+        />
+      </form>
     </Dialog>
   )
 }