fix subbridge (#438)

* fix subbridge * remove loading button * update claim alert
Phala-Network · Jan 14, 2025 · 3cf34c6 · 3cf34c6
1 parent b2303ec
commit 3cf34c6
Show file tree

Hide file tree

Showing 41 changed files with 288 additions and 415 deletions.
diff --git a/apps/app/components/AssetTransfer.tsx b/apps/app/components/AssetTransfer.tsx
@@ -1,9 +1,9 @@
 import usePolkadotApi from '@/hooks/usePolkadotApi'
 import useSignAndSend from '@/hooks/useSignAndSend'
 import {barlow} from '@/lib/theme'
-import {LoadingButton} from '@mui/lab'
 import {
   Alert,
+  Button,
   DialogActions,
   DialogContent,
   DialogTitle,
@@ -111,14 +111,14 @@ const AssetTransfer: FC<{asset: Asset; onClose: () => void}> = ({
         </Alert>
       </DialogContent>
       <DialogActions>
-        <LoadingButton
+        <Button
           variant="text"
           loading={loading}
           disabled={!isValid}
           onClick={transfer}
         >
           Submit
-        </LoadingButton>
+        </Button>
       </DialogActions>
     </>
   )

diff --git a/apps/app/components/BasePool/ClaimDelegation.tsx b/apps/app/components/BasePool/ClaimDelegation.tsx
@@ -1,6 +1,5 @@
 import usePolkadotApi from '@/hooks/usePolkadotApi'
 import useSignAndSend from '@/hooks/useSignAndSend'
-import {LoadingButton} from '@mui/lab'
 import {
   Button,
   DialogActions,
@@ -109,14 +108,14 @@ const ClaimDelegation: FC<{
         />
       </DialogContent>
       <DialogActions>
-        <LoadingButton
+        <Button
           variant="text"
           onClick={claimReward}
           disabled={!addressValid}
           loading={loading}
         >
           Submit
-        </LoadingButton>
+        </Button>
       </DialogActions>
     </>
   )

diff --git a/apps/app/components/BasePool/ClaimReward.tsx b/apps/app/components/BasePool/ClaimReward.tsx
@@ -1,6 +1,5 @@
 import usePolkadotApi from '@/hooks/usePolkadotApi'
 import useSignAndSend from '@/hooks/useSignAndSend'
-import {LoadingButton} from '@mui/lab'
 import {
   Button,
   DialogActions,
@@ -115,14 +114,14 @@ const ClaimReward: FC<{
         />
       </DialogContent>
       <DialogActions>
-        <LoadingButton
+        <Button
           variant="text"
           onClick={claimReward}
           disabled={!addressValid}
           loading={loading}
         >
           Submit
-        </LoadingButton>
+        </Button>
       </DialogActions>
     </>
   )

diff --git a/apps/app/components/BasePool/CreateButton.tsx b/apps/app/components/BasePool/CreateButton.tsx
@@ -1,13 +1,14 @@
 import usePolkadotApi from '@/hooks/usePolkadotApi'
 import useSignAndSend from '@/hooks/useSignAndSend'
 import type {BasePoolKind} from '@/lib/subsquidQuery'
-import type {LoadingButtonProps} from '@mui/lab'
+import type {ButtonProps} from '@mui/material'
 import type {FC} from 'react'
 import PromiseButton from '../PromiseButton'
 
-const CreateButton: FC<
-  {kind: BasePoolKind} & Omit<LoadingButtonProps, 'onClick'>
-> = ({kind, ...props}) => {
+const CreateButton: FC<{kind: BasePoolKind} & Omit<ButtonProps, 'onClick'>> = ({
+  kind,
+  ...props
+}) => {
   const api = usePolkadotApi()
   const signAndSend = useSignAndSend()
   const onClick = async (): Promise<void> => {

diff --git a/apps/app/components/BasePool/DelegateInput.tsx b/apps/app/components/BasePool/DelegateInput.tsx
@@ -8,8 +8,7 @@ import useSignAndSend from '@/hooks/useSignAndSend'
 import {aprToApy} from '@/lib/apr'
 import type {BasePoolCommonFragment} from '@/lib/subsquidQuery'
 import {barlow} from '@/lib/theme'
-import {LoadingButton} from '@mui/lab'
-import {Skeleton, Stack, type SxProps, TextField} from '@mui/material'
+import {Button, Skeleton, Stack, type SxProps, TextField} from '@mui/material'
 import {getDecimalPattern, toCurrency, toPercentage} from '@phala/lib'
 import {polkadotAccountAtom} from '@phala/store'
 import Decimal from 'decimal.js'
@@ -125,7 +124,7 @@ const DelegateInput: FC<{basePool: BasePoolCommonFragment; sx?: SxProps}> = ({
             }
           }}
         />
-        <LoadingButton
+        <Button
           onClick={() => {
             delegate()
           }}
@@ -135,7 +134,7 @@ const DelegateInput: FC<{basePool: BasePoolCommonFragment; sx?: SxProps}> = ({
           variant="contained"
         >
           Delegate
-        </LoadingButton>
+        </Button>
       </Stack>
       <Property
         size="small"

diff --git a/apps/app/components/BasePool/OwnerSettings.tsx b/apps/app/components/BasePool/OwnerSettings.tsx
@@ -3,8 +3,8 @@ import usePoolIntro, {type PoolIntro} from '@/hooks/usePoolIntro'
 import useSignAndSend from '@/hooks/useSignAndSend'
 import type {BasePoolCommonFragment} from '@/lib/subsquidQuery'
 import {barlow} from '@/lib/theme'
-import {LoadingButton} from '@mui/lab'
 import {
+  Button,
   DialogContent,
   DialogTitle,
   Grid2 as Grid,
@@ -140,15 +140,15 @@ const OwnerSettings: FC<{
                 }
               }}
             />
-            <LoadingButton
+            <Button
               onClick={setCommission}
               disabled={!commissionValid}
               loading={commissionLoading}
               color={color}
               variant="contained"
             >
               Save
-            </LoadingButton>
+            </Button>
           </Stack>
 
           {!isVault && (
@@ -175,15 +175,15 @@ const OwnerSettings: FC<{
                   }
                 }}
               />
-              <LoadingButton
+              <Button
                 onClick={setCapacity}
                 disabled={capacityString === ''}
                 loading={capacityLoading}
                 color={color}
                 variant="contained"
               >
                 Save
-              </LoadingButton>
+              </Button>
             </Stack>
           )}
         </Stack>
@@ -298,7 +298,7 @@ const OwnerSettings: FC<{
         </Grid>
 
         <Stack direction="row" justifyContent="flex-end">
-          <LoadingButton
+          <Button
             disabled={!introLoaded}
             onClick={() => {
               void saveIntro()
@@ -308,7 +308,7 @@ const OwnerSettings: FC<{
             variant="contained"
           >
             Save Intro
-          </LoadingButton>
+          </Button>
         </Stack>
       </DialogContent>
     </>

diff --git a/apps/app/components/BasePool/Whitelist/AddWhitelist.tsx b/apps/app/components/BasePool/Whitelist/AddWhitelist.tsx
@@ -1,7 +1,7 @@
 import usePolkadotApi from '@/hooks/usePolkadotApi'
 import useSignAndSend from '@/hooks/useSignAndSend'
-import {LoadingButton} from '@mui/lab'
 import {
+  Button,
   DialogActions,
   DialogContent,
   DialogTitle,
@@ -53,14 +53,14 @@ const AddWhitelist: FC<{
         />
       </DialogContent>
       <DialogActions>
-        <LoadingButton
+        <Button
           disabled={!isValid}
           loading={loading}
           variant="text"
           onClick={onClick}
         >
           Submit
-        </LoadingButton>
+        </Button>
       </DialogActions>
     </>
   )

diff --git a/apps/app/components/BasePool/Worker/AddWorker.tsx b/apps/app/components/BasePool/Worker/AddWorker.tsx
@@ -1,7 +1,7 @@
 import usePolkadotApi from '@/hooks/usePolkadotApi'
 import useSignAndSend from '@/hooks/useSignAndSend'
-import {LoadingButton} from '@mui/lab'
 import {
+  Button,
   DialogActions,
   DialogContent,
   DialogTitle,
@@ -56,14 +56,14 @@ const AddWorker: FC<{
         />
       </DialogContent>
       <DialogActions>
-        <LoadingButton
+        <Button
           loading={loading}
           variant="text"
           onClick={onClick}
           disabled={!isValid}
         >
           Submit
-        </LoadingButton>
+        </Button>
       </DialogActions>
     </>
   )

diff --git a/apps/app/components/BasePool/Worker/ChangeStake.tsx b/apps/app/components/BasePool/Worker/ChangeStake.tsx
@@ -4,8 +4,8 @@ import usePolkadotApi from '@/hooks/usePolkadotApi'
 import useSignAndSend from '@/hooks/useSignAndSend'
 import {type GlobalStateQuery, useGlobalStateQuery} from '@/lib/subsquidQuery'
 import {barlow} from '@/lib/theme'
-import {LoadingButton} from '@mui/lab'
 import {
+  Button,
   DialogActions,
   DialogContent,
   DialogTitle,
@@ -155,14 +155,14 @@ const ChangeStake: FC<{
         </Stack>
       </DialogContent>
       <DialogActions>
-        <LoadingButton
+        <Button
           loading={loading}
           variant="text"
           onClick={onClick}
           disabled={amountString === ''}
         >
           Submit
-        </LoadingButton>
+        </Button>
       </DialogActions>
     </>
   )

diff --git a/apps/app/components/ClaimKhalaAssets.tsx b/apps/app/components/ClaimKhalaAssets.tsx
@@ -11,7 +11,6 @@ import {useSharePrice} from '@/hooks/staking'
 import {useAutoSwitchChain} from '@/hooks/useAutoSwitchChain'
 import {walletDialogOpenAtom} from '@/store/ui'
 import {CheckCircleOutline, ContentCopy} from '@mui/icons-material'
-import {LoadingButton} from '@mui/lab'
 import {
   Box,
   Button,
@@ -374,15 +373,15 @@ const ClaimKhalaAssets = () => {
 
                 <Box component="form" onSubmit={handleSubmit}>
                   <SwitchChainButton>
-                    <LoadingButton
+                    <Button
                       variant="contained"
                       disabled={!ethAddress || !isClaimable}
                       fullWidth
                       type="submit"
                       loading={isLoading}
                     >
                       Claim
-                    </LoadingButton>
+                    </Button>
                   </SwitchChainButton>
                 </Box>
               </>

diff --git a/apps/app/components/Delegation/Withdraw.tsx b/apps/app/components/Delegation/Withdraw.tsx
@@ -2,7 +2,6 @@ import usePolkadotApi from '@/hooks/usePolkadotApi'
 import useSignAndSend from '@/hooks/useSignAndSend'
 import type {DelegationCommonFragment} from '@/lib/subsquidQuery'
 import {barlow} from '@/lib/theme'
-import {LoadingButton} from '@mui/lab'
 import {
   Alert,
   AlertTitle,
@@ -132,14 +131,14 @@ const Withdraw: FC<{
       </DialogContent>
 
       <DialogActions>
-        <LoadingButton
+        <Button
           loading={loading}
           variant="text"
           onClick={onClick}
           disabled={!isValid}
         >
           Submit
-        </LoadingButton>
+        </Button>
       </DialogActions>
     </>
   )

diff --git a/apps/app/components/PromiseButton.tsx b/apps/app/components/PromiseButton.tsx
@@ -1,16 +1,16 @@
-import {LoadingButton, type LoadingButtonProps} from '@mui/lab'
+import {Button, type ButtonProps} from '@mui/material'
 import {type FC, useState} from 'react'
 
 const PromiseButton: FC<
-  Omit<LoadingButtonProps, 'onClick'> & {
+  Omit<ButtonProps, 'onClick'> & {
     onClick?: (
-      ...args: Parameters<Exclude<LoadingButtonProps['onClick'], undefined>>
+      ...args: Parameters<Exclude<ButtonProps['onClick'], undefined>>
     ) => Promise<unknown>
   }
 > = ({onClick, ...props}) => {
   const [loading, setLoading] = useState(false)
 
-  const handleClick: LoadingButtonProps['onClick'] = (e) => {
+  const handleClick: ButtonProps['onClick'] = (e) => {
     if (onClick != null) {
       setLoading(true)
       void onClick(e).finally(() => {
@@ -19,7 +19,7 @@ const PromiseButton: FC<
     }
   }
 
-  return <LoadingButton {...props} loading={loading} onClick={handleClick} />
+  return <Button {...props} loading={loading} onClick={handleClick} />
 }
 
 export default PromiseButton
diff --git a/apps/app/components/Staking/Stake.tsx b/apps/app/components/Staking/Stake.tsx
@@ -16,7 +16,6 @@ import {
 } from '@/hooks/staking'
 import {barlow} from '@/lib/theme'
 import {OpenInNew, Unarchive} from '@mui/icons-material'
-import {LoadingButton} from '@mui/lab'
 import {
   Box,
   Button,
@@ -439,7 +438,7 @@ const Stake = () => {
         </Paper>
 
         <SwitchChainButton>
-          <LoadingButton
+          <Button
             fullWidth
             sx={{mt: 2}}
             type="submit"
@@ -464,7 +463,7 @@ const Stake = () => {
               (needApprove ? 'Approve and Stake' : 'Stake')}
             {buttonErrorMessage == null && isUnstake && 'Unstake'}
             {buttonErrorMessage != null && buttonErrorMessage}
-          </LoadingButton>
+          </Button>
         </SwitchChainButton>
       </Stack>
     </Box>