Bump @chakra-ui/react to 2.0.0 + nits

Closes: aptos-labs#974
vldslvpolakova · May 13, 2022 · 7a646ab · 7a646ab
1 parent 4a383a9
commit 7a646ab
Show file tree

Hide file tree

Showing 8 changed files with 553 additions and 600 deletions.
diff --git a/ecosystem/web-wallet/package.json b/ecosystem/web-wallet/package.json
@@ -3,8 +3,8 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@chakra-ui/icons": "^1.1.7",
-    "@chakra-ui/react": "^1.8.8",
+    "@chakra-ui/icons": "^2.0.0",
+    "@chakra-ui/react": "^2.0.0",
     "@emotion/react": "^11",
     "@emotion/styled": "^11",
     "@types/jest": "^27.4.1",

diff --git a/ecosystem/web-wallet/src/components/CreateNFTModal.tsx b/ecosystem/web-wallet/src/components/CreateNFTModal.tsx
@@ -1,3 +1,6 @@
+// Copyright (c) Aptos
+// SPDX-License-Identifier: Apache-2.0
+
 import { AddIcon } from '@chakra-ui/icons'
 import {
   Button,

diff --git a/ecosystem/web-wallet/src/components/WalletFooter.tsx b/ecosystem/web-wallet/src/components/WalletFooter.tsx
@@ -1,4 +1,3 @@
-
 // Copyright (c) Aptos
 // SPDX-License-Identifier: Apache-2.0
 

diff --git a/ecosystem/web-wallet/src/components/WalletHeader.tsx b/ecosystem/web-wallet/src/components/WalletHeader.tsx
@@ -44,7 +44,7 @@ export default function WalletHeader () {
               whiteSpace="nowrap"
               overflow="hidden"
               display="block"
-              isTruncated
+              noOfLines={1}
               maxW={['100px', '120px']}
               cursor="pointer"
               onClick={onCopy}

diff --git a/ecosystem/web-wallet/src/index.tsx b/ecosystem/web-wallet/src/index.tsx
@@ -17,8 +17,6 @@ import CreateWallet from './pages/CreateWallet'
 import Account from './pages/Account'
 import Gallery from './pages/Gallery'
 
-export const queryClient = new QueryClient()
-
 const theme: ThemeConfig = extendTheme({
   initialColorMode: 'dark',
   useSystemColorMode: false,
@@ -32,6 +30,8 @@ const theme: ThemeConfig = extendTheme({
   }
 })
 
+export const queryClient = new QueryClient()
+
 const root = createRoot(document.getElementById('root') as Element)
 
 root.render(

diff --git a/ecosystem/web-wallet/src/pages/Account.tsx b/ecosystem/web-wallet/src/pages/Account.tsx
@@ -45,7 +45,7 @@ export const CredentialRow = ({
       </Flex>
       <Flex alignItems="flex-end">
         <Tooltip label={hasCopied ? 'Copied!' : 'Copy'} closeDelay={300}>
-          <Text fontSize="xs" cursor="pointer" isTruncated onClick={onCopy}>
+          <Text fontSize="xs" cursor="pointer" noOfLines={1} onClick={onCopy}>
             {body}
           </Text>
         </Tooltip>

diff --git a/ecosystem/web-wallet/src/pages/Wallet.tsx b/ecosystem/web-wallet/src/pages/Wallet.tsx
@@ -66,35 +66,37 @@ export const getAccountResources = async ({
 
 export type Inputs = Record<string, any>
 
+interface SubmitTransactionProps {
+  toAddress: string;
+  fromAddress: AptosAccount;
+  amount: string;
+  nodeUrl?: string;
+}
+
 interface FundWithFaucetProps {
   nodeUrl?: string;
+  faucetUrl?: string;
   address?: string;
 }
 
-const TransferResult = Object.freeze({
-  UndefinedAccount: 'Account does not exist',
-  AmountOverLimit: 'Amount is over limit',
-  AmountWithGasOverLimit: 'Amount with gas is over limit',
-  IncorrectPayload: 'Incorrect transaction payload',
-  Success: 'Transaction executed successfully'
-} as const)
-
 const fundWithFaucet = async ({
   nodeUrl = NODE_URL,
+  faucetUrl = FAUCET_URL,
   address
 }: FundWithFaucetProps): Promise<void> => {
-  const faucetClient = new FaucetClient(nodeUrl, FAUCET_URL)
+  const faucetClient = new FaucetClient(nodeUrl, faucetUrl)
   if (address) {
     await faucetClient.fundAccount(address, 5000)
   }
 }
 
-interface SubmitTransactionProps {
-  toAddress: string;
-  fromAddress: AptosAccount;
-  amount: string;
-  nodeUrl?: string;
-}
+const TransferResult = Object.freeze({
+  UndefinedAccount: 'Account does not exist',
+  AmountOverLimit: 'Amount is over limit',
+  AmountWithGasOverLimit: 'Amount with gas is over limit',
+  IncorrectPayload: 'Incorrect transaction payload',
+  Success: 'Transaction executed successfully'
+} as const)
 
 const submitTransaction = async ({
   toAddress,
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@

		// Copyright (c) Aptos
		// SPDX-License-Identifier: Apache-2.0

Expand Down