Skip to content

Commit d8c2a7b

Browse files
blushiblushi
committed
Merge remote-tracking branch 'origin/main' into fix-dev-sync-v2.7.5
2 parents ea9cf7c + bf2a322 commit d8c2a7b

File tree

12 files changed

+44
-24
lines changed

12 files changed

+44
-24
lines changed

‎CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [2.7.5](https://github.com/regen-network/regen-web/compare/v2.7.3...v2.7.5) (2025-01-27)
7+
8+
### Bug Fixes
9+
10+
- install error ([544903c](https://github.com/regen-network/regen-web/commit/544903cb71499b81c34b21e9b95e6d17a4bdab1f))
11+
- remove canvas as a dev dependency ([e9201ea](https://github.com/regen-network/regen-web/commit/e9201eaabb56dd5192286f9daf48addec70332a6))
12+
- remove walletLoaded in Terrasos.Providers ([b0afb16](https://github.com/regen-network/regen-web/commit/b0afb16e70c6fd0bd1de94373e569c7b8de03ea8))
13+
- remove walletLoaded prop from LedgerProvider ([9f0eebf](https://github.com/regen-network/regen-web/commit/9f0eebfae93ee4cc114ca98038d56e87fd04f28f))
14+
- remove walletLoaded prop from LedgerProvider and simplify API fetching logic ([7ef4f3f](https://github.com/regen-network/regen-web/commit/7ef4f3fe8e1e9babec19b49816137235c7ae5ece))
15+
- update API when wallet is loaded ([ebc2096](https://github.com/regen-network/regen-web/commit/ebc209645bfd393e0ae56592b9650610d167c29d))
16+
617
## [2.7.4](https://github.com/regen-network/regen-web/compare/v2.7.3...v2.7.4) (2024-10-25)
718

819
### Bug Fixes

‎bun.lockb‎

-8 Bytes
Binary file not shown.

‎lerna.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2.7.4",
2+
"version": "2.7.5",
33
"npmClient": "yarn",
44
"useWorkspaces": true,
55
"packages": ["web-marketplace", "web-components", "web-storybook", "web-www"]

‎web-components/CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [2.7.5](https://github.com/regen-network/regen-web/compare/v2.7.3...v2.7.5) (2025-01-27)
7+
8+
### Bug Fixes
9+
10+
- remove canvas as a dev dependency ([e9201ea](https://github.com/regen-network/regen-web/commit/e9201eaabb56dd5192286f9daf48addec70332a6))
11+
612
# [2.7.0](https://github.com/regen-network/regen-web/compare/v2.6.5...v2.7.0) (2024-09-11)
713

814
### Bug Fixes

‎web-components/package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web-components",
3-
"version": "2.7.0",
3+
"version": "2.7.5",
44
"private": true,
55
"main": "build/index.js",
66
"type": "module",
@@ -92,7 +92,6 @@
9292
"@testing-library/react": "^16.0.0",
9393
"@types/mapbox__mapbox-sdk": "^0.11.1",
9494
"@types/react-lazyload": "^3.1.0",
95-
"canvas": "^2.11.2",
9695
"clsx": "^2.0.0",
9796
"csstype": "^3.1.1",
9897
"eslint-plugin-react-hooks": "^4.6.0",

‎web-marketplace/CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [2.7.5](https://github.com/regen-network/regen-web/compare/v2.7.3...v2.7.5) (2025-01-27)
7+
8+
### Bug Fixes
9+
10+
- remove walletLoaded in Terrasos.Providers ([b0afb16](https://github.com/regen-network/regen-web/commit/b0afb16e70c6fd0bd1de94373e569c7b8de03ea8))
11+
- remove walletLoaded prop from LedgerProvider ([9f0eebf](https://github.com/regen-network/regen-web/commit/9f0eebfae93ee4cc114ca98038d56e87fd04f28f))
12+
- remove walletLoaded prop from LedgerProvider and simplify API fetching logic ([7ef4f3f](https://github.com/regen-network/regen-web/commit/7ef4f3fe8e1e9babec19b49816137235c7ae5ece))
13+
- update API when wallet is loaded ([ebc2096](https://github.com/regen-network/regen-web/commit/ebc209645bfd393e0ae56592b9650610d167c29d))
14+
615
## [2.7.4](https://github.com/regen-network/regen-web/compare/v2.7.3...v2.7.4) (2024-10-25)
716

817
**Note:** Version bump only for package web-marketplace

‎web-marketplace/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web-marketplace",
3-
"version": "2.7.4",
3+
"version": "2.7.5",
44
"private": true,
55
"dependencies": {
66
"@analytics/amplitude": "^0.1.3",

‎web-marketplace/src/clients/terrasos/Terrasos.Providers.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import './Terrasos.base.css';
1414
export const TerrasosProvider = () => {
1515
return (
1616
<SharedProviders customTheme={terrasosMuiTheme}>
17-
<LedgerProvider walletLoaded>
17+
<LedgerProvider>
1818
<TerrasosRoutes
1919
reactQueryClient={reactQueryClient}
2020
apolloClientFactory={apolloClientFactory}

‎web-marketplace/src/ledger.tsx‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -85,31 +85,22 @@ const getApi = async (
8585

8686
export const LedgerProviderWithWallet: React.FC<React.PropsWithChildren<{}>> =
8787
({ children }) => {
88-
const { wallet, loaded } = useWallet();
89-
90-
// Prevent rendering until wallet is loaded
91-
if (!loaded) {
92-
return <Loading className="h-screen" />;
93-
}
94-
95-
return (
96-
<LedgerProvider wallet={wallet} walletLoaded={loaded}>
97-
{children}
98-
</LedgerProvider>
99-
);
88+
const { wallet } = useWallet();
89+
90+
return <LedgerProvider wallet={wallet}>{children}</LedgerProvider>;
10091
};
10192

10293
export const LedgerProvider: React.FC<
103-
React.PropsWithChildren<{ wallet?: Wallet; walletLoaded: boolean }>
104-
> = ({ walletLoaded, wallet, children }) => {
94+
React.PropsWithChildren<{ wallet?: Wallet }>
95+
> = ({ wallet, children }) => {
10596
const [api, setApi] = useState<RegenApi | undefined>(undefined);
10697
const [loading, setLoading] = useState<boolean>(false);
10798
const [error, setError] = useState<unknown>(undefined);
10899

109100
useEffect(() => {
110-
if (walletLoaded && !api)
101+
if (!api || (!!wallet?.offlineSigner && !api.msgClient))
111102
getApi(setApi, setLoading, setError, wallet?.offlineSigner);
112-
}, [api, setApi, setLoading, setError, wallet?.offlineSigner, walletLoaded]);
103+
}, [api, setApi, setLoading, setError, wallet?.offlineSigner]);
113104

114105
return (
115106
<LedgerContext.Provider value={{ error, loading, api }}>

‎web-www/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [2.7.5](https://github.com/regen-network/regen-web/compare/v2.7.3...v2.7.5) (2025-01-27)
7+
8+
**Note:** Version bump only for package web-www
9+
610
## [2.7.4](https://github.com/regen-network/regen-web/compare/v2.7.3...v2.7.4) (2024-10-25)
711

812
**Note:** Version bump only for package web-www

0 commit comments

Comments
 (0)