Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
dc52e40
build(deps-dev): bump concurrently from 8.2.2 to 9.1.0
dependabot[bot] Dec 2, 2024
c48fb54
build(deps): bump react-icons from 5.3.0 to 5.4.0
dependabot[bot] Dec 3, 2024
9757bd4
build(deps): bump react-router-dom from 6.28.0 to 7.0.2
dependabot[bot] Dec 3, 2024
28de1e6
build(deps-dev): bump vite from 5.4.11 to 6.0.3
dependabot[bot] Dec 10, 2024
31f0041
build(deps-dev): bump eslint-plugin-react-hooks from 4.6.2 to 5.1.0
dependabot[bot] Dec 10, 2024
6c2a6bd
Update dependabot
ChiaAutomation Dec 18, 2024
fdd7d22
Merge pull request #404 from Chia-Network/managed-files
TheLastCicada Dec 18, 2024
464f851
Merge pull request #394 from Chia-Network/dependabot/npm_and_yarn/vit…
TheLastCicada Dec 18, 2024
4f044f2
Merge pull request #375 from Chia-Network/dependabot/npm_and_yarn/con…
TheLastCicada Dec 18, 2024
fb6b8f9
Merge pull request #388 from Chia-Network/dependabot/npm_and_yarn/rea…
TheLastCicada Dec 18, 2024
5e7cc0f
Merge pull request #390 from Chia-Network/dependabot/npm_and_yarn/rea…
TheLastCicada Dec 18, 2024
3023c92
build(deps-dev): bump tailwindcss from 3.4.15 to 3.4.17
dependabot[bot] Dec 18, 2024
a5c104c
Merge pull request #403 from Chia-Network/dependabot/npm_and_yarn/tai…
TheLastCicada Dec 18, 2024
97b4392
Merge pull request #395 from Chia-Network/dependabot/npm_and_yarn/esl…
TheLastCicada Dec 18, 2024
91981fa
build(deps): bump react-intl from 6.8.9 to 7.0.4
dependabot[bot] Dec 18, 2024
e545ea5
build(deps): bump @reduxjs/toolkit from 2.4.0 to 2.5.0
dependabot[bot] Dec 18, 2024
d87f5da
build(deps-dev): bump lint-staged from 15.2.10 to 15.2.11
dependabot[bot] Dec 18, 2024
fc3a5b6
Merge pull request #391 from Chia-Network/dependabot/npm_and_yarn/rea…
TheLastCicada Dec 18, 2024
945b210
Merge pull request #405 from Chia-Network/dependabot/npm_and_yarn/red…
TheLastCicada Dec 18, 2024
8d5eb03
Merge pull request #406 from Chia-Network/dependabot/npm_and_yarn/lin…
TheLastCicada Dec 18, 2024
4983de6
feat: integrate get and post req for address book
Dec 20, 2024
4fa9aa8
feat: add functionality to delete address book items
Dec 23, 2024
3de7a7c
feat: integrate fucntionality to update address book item
Dec 24, 2024
0e214ca
refactor: rename `deleteAddressBookItem` mutation to `deleteAddress`
Dec 24, 2024
e8ca587
refactor: rename delete confirmation modal
Dec 24, 2024
00891f3
refactor: rename `editAddressBookItem` mutation to `editAddress`
Dec 24, 2024
64f542e
refactor: rename AddAddress to Upsert
Dec 24, 2024
71867c9
refactor: refactor ConfirmDeleteAddressModal for readability and cons…
Dec 24, 2024
f1feaf9
refactor: update formatted messages and tokens
Dec 24, 2024
a90f15f
feat: add select in create token form
Dec 27, 2024
fb7c6d1
refactor: remove createAt, updatedAt and update .schema
Jan 1, 2025
d007456
refactor: rename `UpsertAddressModal` to `UpsertWalletAddressModal`
Jan 1, 2025
e704ef4
refactor: rename `ConfirmDeleteAddressModal` to `ConfirmDeleteWalletA…
Jan 1, 2025
1230e79
refactor: rename `UpsertAddressForm` to `UpsertWalletAddressForm`
Jan 1, 2025
12a54ab
refactor: rename `AddAddressButton` to `AddWalletAddressButton`
Jan 1, 2025
e367662
style: add spacing to the button
Jan 2, 2025
991ea94
fix: resolve type error in CreateTokenForm
Jan 2, 2025
11847bf
Merge pull request #410 from Chia-Network/feat-address-book
wwills2 Jan 2, 2025
f042ea2
Update license
ChiaAutomation Jan 8, 2025
7a4e498
Merge pull request #420 from Chia-Network/update-license
TheLastCicada Jan 8, 2025
1f7e203
fix: connect form wallet address regex
wwills2 Jan 9, 2025
3a6b760
Merge pull request #424 from Chia-Network/fix-connect-regex
wwills2 Jan 14, 2025
2343de1
fix: tokenization modal wallet address validations
wwills2 Jan 17, 2025
8e44f5c
Merge pull request #428 from Chia-Network/fix-tokenization-modal-vali…
wwills2 Jan 17, 2025
e876d15
chore: dep-updates
wwills2 Jan 27, 2025
53c6d82
fix: ts error
wwills2 Jan 27, 2025
c35215b
Merge pull request #433 from Chia-Network/dep-updates
wwills2 Jan 28, 2025
1795708
fix: querying for extraneous project Ids
wwills2 Jan 29, 2025
05e4374
fix: querying for extraneous project Ids
wwills2 Jan 29, 2025
9fbc29c
Merge remote-tracking branch 'origin/project-id-query-fix' into proje…
wwills2 Jan 30, 2025
b38a635
Merge pull request #437 from Chia-Network/project-id-query-fix
wwills2 Jan 30, 2025
be74f5c
chore: version bump
TheLastCicada Feb 7, 2025
385675d
Merge pull request #443 from Chia-Network/125
TheLastCicada Feb 7, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ updates:
reviewers: ["emlowe", "altendky"]

- package-ecosystem: "github-actions"
directory: /
directories: ["/", ".github/actions/*"]
schedule:
interval: "weekly"
day: "tuesday"
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2024 Chia Network Inc.
Copyright 2025 Chia Network Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2,649 changes: 804 additions & 1,845 deletions package-lock.json

Large diffs are not rendered by default.

50 changes: 25 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "climate-tokenization-engine-ui",
"private": true,
"version": "1.2.4",
"version": "1.2.5",
"type": "module",
"main": "build/main.js",
"engineStrict": true,
Expand All @@ -26,10 +26,10 @@
"electron:package:linux": "npm run clean && npm run build && electron-builder -l -c.extraMetadata.main=build/main.js"
},
"dependencies": {
"@reduxjs/toolkit": "^2.4.0",
"@reduxjs/toolkit": "^2.5.1",
"@types/styled-components": "^5.1.34",
"@xterm/xterm": "^5.5.0",
"@zip.js/zip.js": "^2.7.53",
"@zip.js/zip.js": "^2.7.54",
"dayjs": "^1.11.13",
"flowbite": "^2.5.2",
"flowbite-react": "^0.10.2",
Expand All @@ -38,43 +38,43 @@
"react": "^18.3.1",
"react-content-loader": "^7.0.2",
"react-dom": "^18.3.1",
"react-icons": "^5.3.0",
"react-intl": "^6.8.9",
"react-redux": "^9.1.2",
"react-router-dom": "^6.28.0",
"react-icons": "^5.4.0",
"react-intl": "^7.1.5",
"react-redux": "^9.2.0",
"react-router-dom": "^7.1.3",
"redux-persist": "^6.0.0",
"simplebar": "^6.2.7",
"simplebar-react": "^3.2.6",
"styled-components": "^6.1.13",
"simplebar": "^6.3.0",
"simplebar-react": "^3.3.0",
"styled-components": "^6.1.14",
"tailwind-scrollbar": "^3.1.0",
"uuid": "^11.0.3",
"yup": "^1.4.0"
"uuid": "^11.0.5",
"yup": "^1.6.1"
},
"devDependencies": {
"@commitlint/config-conventional": "^19.6.0",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@types/react": "^18.3.18",
"@types/react-dom": "^18.3.5",
"@types/react-router-dom": "^5.3.3",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@vitejs/plugin-react-swc": "^3.7.2",
"autoprefixer": "^10.4.20",
"concurrently": "^8.2.2",
"concurrently": "^9.1.2",
"cross-env": "^7.0.3",
"electron": "^33.2.1",
"electron": "^33.3.2",
"electron-builder": "^25.1.8",
"eslint": "^8.57.1",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.16",
"eslint-plugin-react-hooks": "^5.1.0",
"eslint-plugin-react-refresh": "^0.4.18",
"husky": "^9.1.7",
"lint-staged": "^15.2.10",
"postcss": "^8.4.49",
"prettier": "^3.4.1",
"lint-staged": "^15.4.3",
"postcss": "^8.5.1",
"prettier": "^3.4.2",
"standard-version": "^9.5.0",
"tailwindcss": "^3.4.15",
"typescript": "^5.7.2",
"vite": "^5.4.11",
"wait-on": "^8.0.1"
"tailwindcss": "^3.4.17",
"typescript": "^5.7.3",
"vite": "^6.0.11",
"wait-on": "^8.0.2"
},
"standard-version": {
"skip": {
Expand Down
1 change: 0 additions & 1 deletion src/renderer/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ function App() {
if (event.origin === window.origin) {
const message = event.data;
if (message?.selectedLocale && message.selectedLocale !== appStore.locale) {
console.log('selected locale', message.selectedLocale);
dispatch(setLocale(message.selectedLocale));
}
}
Expand Down
1 change: 1 addition & 0 deletions src/renderer/api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ export * from './tokenization-engine/projects.api';
export * from './tokenization-engine/system.api';
export * from './tokenization-engine/units.api';
export * from './tokenization-engine/organizations.api';
export * from './tokenization-engine/address-book.api';
105 changes: 105 additions & 0 deletions src/renderer/api/tokenization-engine/address-book.api.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
import { Address } from '@/schemas/Address.schema';
import { addressBookTag, RECORDS_PER_PAGE, tokenizationEngineApi } from './index';

interface GetAddressBookParams {
page?: number;
search?: string | null;
order?: string | null;
limit?: number;
}

interface GetAddressBookResponse {
page: number;
pageCount: number;
data: Address[];
}

interface GetAddressParams {
id: string;
}

interface CreateAddressParams {
name: string;
walletAddress?: string;
}

const addressBookApi = tokenizationEngineApi.injectEndpoints({
endpoints: (builder) => ({
getAddressBook: builder.query<GetAddressBookResponse, GetAddressBookParams>({
query: ({ page, search, order, limit }: GetAddressBookParams) => {
const params: GetAddressBookParams = { page, limit: limit || RECORDS_PER_PAGE };

if (search) {
params.search = search.replace(/[^a-zA-Z0-9 _.-]+/, '');
}

if (order) {
params.order = order;
}

return {
url: `/address-book`,
params,
method: 'GET',
};
},
providesTags: [addressBookTag],
}),

getAddress: builder.query<Address, GetAddressParams>({
query: ({ id }: GetAddressParams) => ({
url: `/address-book`,
params: { id },
method: 'GET',
}),
providesTags: (_response, _error, { id }) => [{ type: addressBookTag, id: id }],
}),

createAddress: builder.mutation<any, CreateAddressParams>({
query: (createAddressParams: CreateAddressParams) => ({
url: '/address-book',
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: createAddressParams,
}),
invalidatesTags: [addressBookTag],
}),

deleteAddress: builder.mutation<any, { uuid: string }>({
query: ({ uuid }) => {
return {
url: `/address-book`,
method: 'DELETE',
headers: { 'Content-Type': 'application/json' },
body: { id: uuid },
};
},
invalidatesTags: [addressBookTag],
}),

editAddress: builder.mutation<any, { id: string; name?: string; walletAddress?: string }>({
query: (data) => {
const body: any = {};
if (data.id) body.id = data.id;
if (data.name) body.name = data.name;
if (data.walletAddress) body.walletAddress = data.walletAddress;
return {
url: `/address-book`,
method: 'PUT',
body,
};
},
invalidatesTags: [addressBookTag],
}),
}),
});

export const invalidateAddressBookApiTag = addressBookApi.util.invalidateTags;

export const {
useCreateAddressMutation,
useGetAddressQuery,
useGetAddressBookQuery,
useDeleteAddressMutation,
useEditAddressMutation,
} = addressBookApi;
3 changes: 2 additions & 1 deletion src/renderer/api/tokenization-engine/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import initialState from '@/store/slices/app/app.initialstate';

export const RECORDS_PER_PAGE = 10;
export const projectsTag = 'projects';
export const addressBookTag = 'addressBook';
export const untokenizedUnitsTag = 'untokenizedUnits';
export const tokenizedUnitsTag = 'tokenizedUnits';
export const projectsByIdsTag = 'projectsByIds';
Expand Down Expand Up @@ -46,5 +47,5 @@ export const tokenizationEngineApi = createApi({
baseQuery: baseQueryWithDynamicHost,
reducerPath: 'tokenizationEngineApi',
endpoints: () => ({}),
tagTypes: [projectsTag, untokenizedUnitsTag, tokenizedUnitsTag, projectsByIdsTag],
tagTypes: [projectsTag, untokenizedUnitsTag, tokenizedUnitsTag, projectsByIdsTag, addressBookTag],
});
21 changes: 21 additions & 0 deletions src/renderer/components/blocks/buttons/AddWalletAddressButton.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import React from 'react';
import { Button } from '@/components';
import { FormattedMessage } from 'react-intl';

interface AddWalletAddressButtonProps {
setActive: (active: boolean) => void;
}

const AddWalletAddressButton: React.FC<AddWalletAddressButtonProps> = ({ setActive }) => {
return (
<>
<Button onClick={() => setActive(true)}>
<p className="capitalize">
<FormattedMessage id="add-address" />
</p>
</Button>
</>
);
};

export { AddWalletAddressButton };
1 change: 1 addition & 0 deletions src/renderer/components/blocks/buttons/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export * from './ConnectButton';
export * from './FormButton';
export * from './DetokenizeUnitButton';
export * from './AddWalletAddressButton';
2 changes: 1 addition & 1 deletion src/renderer/components/blocks/forms/ConnectForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const validationSchema = yup.object({
.required('Server Address is required')
.matches(
// eslint-disable-next-line no-useless-escape
/^(https?:\/\/(www\.)?)?([a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}|localhost|[a-z0-9]+)(:[0-9]{1,5})?(\/.*)?$/,
/^(https?:\/\/(www\.)?)?([a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}|localhost|[a-z0-9]+|((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))(:[0-9]{1,5})?(\/.*)?$/,
'Please enter a valid server address',
),
apiKey: yup.string(),
Expand Down
Loading
Loading