@xyo-network/react-wallet 2.55.6 → 2.55.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -2,12 +2,12 @@ import { usePromise } from '@xyo-network/react-shared';
2
2
  import { useState } from 'react';
3
3
  import { useContextAccount } from '../contexts';
4
4
  export const useAccount = ({ wallet, account, path, required = false } = {}) => {
5
- let validationError = undefined;
6
- if (wallet && account) {
7
- validationError = Error('useAccount can not have both a wallet and an account in the parameters');
5
+ const [validationError, setValidationError] = useState();
6
+ if (wallet && account && !validationError) {
7
+ setValidationError(Error('useAccount can not have both a wallet and an account in the parameters'));
8
8
  }
9
- if (path && account) {
10
- validationError = Error('useAccount can not have both a path and an account in the parameters');
9
+ if (path && account && !validationError) {
10
+ setValidationError(Error('useAccount can not have both a path and an account in the parameters'));
11
11
  }
12
12
  const [error, setError] = useState();
13
13
  const [contextAccount] = useContextAccount(!(account || wallet) && required);
@@ -28,10 +28,13 @@ export const useAccount = ({ wallet, account, path, required = false } = {}) =>
28
28
  }
29
29
  }
30
30
  catch (ex) {
31
- setError(ex);
31
+ const error = ex;
32
+ console.error(error.message);
33
+ setError(error);
32
34
  }
33
35
  }, [path, wallet, contextAccount, validationError]);
34
36
  if (validationError && !error) {
37
+ console.error(validationError.message);
35
38
  setError(validationError);
36
39
  }
37
40
  return [error ? undefined : activeAccount, error];
@@ -1 +1 @@
1
- {"version":3,"file":"useAccount.js","sourceRoot":"","sources":["../../../src/hooks/useAccount.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAEtD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAS/C,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,GAAG,KAAK,KAAwB,EAAE,EAAoD,EAAE;IAClJ,IAAI,eAAe,GAAsB,SAAS,CAAA;IAClD,IAAI,MAAM,IAAI,OAAO,EAAE;QACrB,eAAe,GAAG,KAAK,CAAC,wEAAwE,CAAC,CAAA;KAClG;IAED,IAAI,IAAI,IAAI,OAAO,EAAE;QACnB,eAAe,GAAG,KAAK,CAAC,sEAAsE,CAAC,CAAA;KAChG;IACD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,MAAM,CAAC,cAAc,CAAC,GAAG,iBAAiB,CAAC,CAAC,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,QAAQ,CAAC,CAAA;IAC5E,MAAM,CAAC,aAAa,CAAC,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;QAC5C,IAAI;YACF,IAAI,CAAC,eAAe,EAAE;gBACpB,IAAI,MAAM,EAAE;oBACV,IAAI,IAAI,EAAE;wBACR,OAAO,MAAM,MAAM,EAAE,UAAU,EAAE,CAAC,IAAI,CAAC,CAAA;qBACxC;yBAAM;wBACL,OAAO,MAAM,CAAA;qBACd;iBACF;qBAAM;oBACL,OAAO,cAAc,CAAA;iBACtB;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,eAAe,CAAC,CAAC,CAAA;IACnD,IAAI,eAAe,IAAI,CAAC,KAAK,EAAE;QAC7B,QAAQ,CAAC,eAAe,CAAC,CAAA;KAC1B;IACD,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;AACnD,CAAC,CAAA"}
1
+ {"version":3,"file":"useAccount.js","sourceRoot":"","sources":["../../../src/hooks/useAccount.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAEtD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAS/C,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,GAAG,KAAK,KAAwB,EAAE,EAAoD,EAAE;IAClJ,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC/D,IAAI,MAAM,IAAI,OAAO,IAAI,CAAC,eAAe,EAAE;QACzC,kBAAkB,CAAC,KAAK,CAAC,wEAAwE,CAAC,CAAC,CAAA;KACpG;IAED,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,eAAe,EAAE;QACvC,kBAAkB,CAAC,KAAK,CAAC,sEAAsE,CAAC,CAAC,CAAA;KAClG;IACD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAS,CAAA;IAC3C,MAAM,CAAC,cAAc,CAAC,GAAG,iBAAiB,CAAC,CAAC,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,QAAQ,CAAC,CAAA;IAC5E,MAAM,CAAC,aAAa,CAAC,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;QAC5C,IAAI;YACF,IAAI,CAAC,eAAe,EAAE;gBACpB,IAAI,MAAM,EAAE;oBACV,IAAI,IAAI,EAAE;wBACR,OAAO,MAAM,MAAM,EAAE,UAAU,EAAE,CAAC,IAAI,CAAC,CAAA;qBACxC;yBAAM;wBACL,OAAO,MAAM,CAAA;qBACd;iBACF;qBAAM;oBACL,OAAO,cAAc,CAAA;iBACtB;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,MAAM,KAAK,GAAG,EAAW,CAAA;YACzB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YAC5B,QAAQ,CAAC,KAAK,CAAC,CAAA;SAChB;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,eAAe,CAAC,CAAC,CAAA;IACnD,IAAI,eAAe,IAAI,CAAC,KAAK,EAAE;QAC7B,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;QACtC,QAAQ,CAAC,eAAe,CAAC,CAAA;KAC1B;IAED,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;AACnD,CAAC,CAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"useAccount.d.ts","sourceRoot":"","sources":["../../../src/hooks/useAccount.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAE5D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAK1D,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,eAAe,CAAA;IACzB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,cAAc,CAAA;CACxB;AAED,eAAO,MAAM,UAAU,yCAAiD,iBAAiB,KAAQ,CAAC,eAAe,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAgC/I,CAAA"}
1
+ {"version":3,"file":"useAccount.d.ts","sourceRoot":"","sources":["../../../src/hooks/useAccount.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAE5D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAK1D,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,eAAe,CAAA;IACzB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,cAAc,CAAA;CACxB;AAED,eAAO,MAAM,UAAU,yCAAiD,iBAAiB,KAAQ,CAAC,eAAe,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,CAoC/I,CAAA"}
package/package.json CHANGED
@@ -18,13 +18,13 @@
18
18
  "@xylabs/react-number-status": "^2.17.4",
19
19
  "@xylabs/react-select": "^2.17.4",
20
20
  "@xylabs/react-shared": "^2.17.4",
21
- "@xyo-network/account": "^2.63.2",
22
- "@xyo-network/account-model": "^2.63.2",
23
- "@xyo-network/core": "^2.63.2",
24
- "@xyo-network/react-address-render": "^2.55.6",
25
- "@xyo-network/react-network": "^2.55.6",
26
- "@xyo-network/react-shared": "^2.55.6",
27
- "@xyo-network/wallet-model": "^2.63.2"
21
+ "@xyo-network/account": "^2.63.6",
22
+ "@xyo-network/account-model": "^2.63.6",
23
+ "@xyo-network/core": "^2.63.6",
24
+ "@xyo-network/react-address-render": "^2.55.8",
25
+ "@xyo-network/react-network": "^2.55.8",
26
+ "@xyo-network/react-shared": "^2.55.8",
27
+ "@xyo-network/wallet-model": "^2.63.6"
28
28
  },
29
29
  "peerDependencies": {
30
30
  "@mui/icons-material": "^5",
@@ -40,7 +40,7 @@
40
40
  "@storybook/react": "^7.0.23",
41
41
  "@xylabs/ts-scripts-yarn3": "^2.17.17",
42
42
  "@xylabs/tsconfig-react": "^2.17.17",
43
- "@xyo-network/react-storybook": "^2.55.6",
43
+ "@xyo-network/react-storybook": "^2.55.8",
44
44
  "typescript": "^5.1.3"
45
45
  },
46
46
  "browser": "dist/esm/index.js",
@@ -85,5 +85,5 @@
85
85
  },
86
86
  "sideEffects": false,
87
87
  "types": "dist/types/index.d.ts",
88
- "version": "2.55.6"
88
+ "version": "2.55.8"
89
89
  }
@@ -13,13 +13,13 @@ export interface AccountHookParams {
13
13
  }
14
14
 
15
15
  export const useAccount = ({ wallet, account, path, required = false }: AccountHookParams = {}): [AccountInstance | undefined, Error | undefined] => {
16
- let validationError: Error | undefined = undefined
17
- if (wallet && account) {
18
- validationError = Error('useAccount can not have both a wallet and an account in the parameters')
16
+ const [validationError, setValidationError] = useState<Error>()
17
+ if (wallet && account && !validationError) {
18
+ setValidationError(Error('useAccount can not have both a wallet and an account in the parameters'))
19
19
  }
20
20
 
21
- if (path && account) {
22
- validationError = Error('useAccount can not have both a path and an account in the parameters')
21
+ if (path && account && !validationError) {
22
+ setValidationError(Error('useAccount can not have both a path and an account in the parameters'))
23
23
  }
24
24
  const [error, setError] = useState<Error>()
25
25
  const [contextAccount] = useContextAccount(!(account || wallet) && required)
@@ -37,11 +37,15 @@ export const useAccount = ({ wallet, account, path, required = false }: AccountH
37
37
  }
38
38
  }
39
39
  } catch (ex) {
40
- setError(ex as Error)
40
+ const error = ex as Error
41
+ console.error(error.message)
42
+ setError(error)
41
43
  }
42
44
  }, [path, wallet, contextAccount, validationError])
43
45
  if (validationError && !error) {
46
+ console.error(validationError.message)
44
47
  setError(validationError)
45
48
  }
49
+
46
50
  return [error ? undefined : activeAccount, error]
47
51
  }