-
-
-
-
-
+ return (
+
+
+
+
+ Verification List
+
+
+
+
+
+ {
+ walletCreated &&
+
+
+
+ }
+ onClickEvent={schemeSelection}
+ />
}
- onClickEvent={schemeSelection}
- />
-
- {
- (proofReqSuccess || errMsg) && (
-
-
setErrMsg(null)}
- >
-
-
- {proofReqSuccess || errMsg}
-
-
-
-
- )}
- {loading ? (
-
-
- ) : verificationList && verificationList.length > 0 ? (
-
-
- {verificationList && verificationList.length > 0 &&
-
- }
-
-
- ) : (
-
-
- There isn't any data available.
-
-
- )}
+ {
+ (proofReqSuccess || errMsg) && (
+
+
setErrMsg(null)}
+ >
+
+
+ {proofReqSuccess || errMsg}
+
+
+
+
+ )}
-
+
+
+ :
+
+ {
+
+ loading ? (
+
+
+
+ ) : verificationList && verificationList.length > 0 ? (
+
+
+ {verificationList && verificationList.length > 0 &&
+
+ }
+
+
+ ) : (
+
+
+ There isn't any data available.
+
+
+ )
+
+ }
+
}
- requestId={requestId}
- userData={userData}
- view={view}
- />
+
+
+
-
- )
-}
+ )
+ }
-export default VerificationCredentialList;
+ export default VerificationCredentialList;
diff --git a/src/components/organization/EditOrgdetailsModal.tsx b/src/components/organization/EditOrgdetailsModal.tsx
index 997179817..3e055d5a6 100644
--- a/src/components/organization/EditOrgdetailsModal.tsx
+++ b/src/components/organization/EditOrgdetailsModal.tsx
@@ -2,7 +2,7 @@ import * as yup from "yup"
import { Avatar, Button, Label, Modal } from 'flowbite-react';
import { Field, Form, Formik, FormikHelpers } from 'formik';
-import { IMG_MAX_HEIGHT, IMG_MAX_WIDTH, apiStatusCodes, imageSizeAccepted, storageKeys } from '../../config/CommonConstant'
+import { IMG_MAX_HEIGHT, IMG_MAX_WIDTH, apiStatusCodes, imageSizeAccepted} from '../../config/CommonConstant'
import { calculateSize, dataURItoBlob } from "../../utils/CompressImage";
import { useEffect, useState } from "react";
@@ -10,26 +10,24 @@ import { AlertComponent } from "../AlertComponent";
import type { AxiosResponse } from 'axios';
import { updateOrganization } from "../../api/organization";
import type { Organisation } from "./interfaces";
+import React from "react";
interface Values {
website: any;
name: string;
description: string;
}
-
interface ILogoImage {
logoFile: string | File
imagePreviewUrl: string | ArrayBuffer | null | File,
fileName: string
}
-
interface EditOrgdetailsModalProps {
openModal: boolean;
setMessage: (message: string) => void;
setOpenModal: (flag: boolean) => void;
onEditSucess?: () => void;
orgData: Organisation | null;
-
}
const EditOrgdetailsModal = (props: EditOrgdetailsModalProps) => {
@@ -55,7 +53,7 @@ const EditOrgdetailsModal = (props: EditOrgdetailsModalProps) => {
setOrgData({
name: props.orgData.name || '',
description: props.orgData.description || '',
- website: props?.orgData?.website || "",
+ website: props?.orgData?.website || "",
});
setLogoImage({
@@ -76,7 +74,7 @@ const EditOrgdetailsModal = (props: EditOrgdetailsModalProps) => {
setOrgData({
name: '',
description: '',
- website:''
+ website:''
})
setLogoImage({
@@ -282,7 +280,6 @@ const EditOrgdetailsModal = (props: EditOrgdetailsModalProps) => {
className="hidden"
id="organizationlogo" title=""
onChange={(event): void => handleImageChange(event)} />
- {/*
{selectedImage || 'No File Chosen'} */}
{imgError ?
{imgError}
:
{logoImage.fileName || 'No File Chosen'}}
@@ -308,7 +305,31 @@ const EditOrgdetailsModal = (props: EditOrgdetailsModalProps) => {
name="name"
value={formikHandlers.values.name}
className="bg-gray-50 border border-gray-300 text-gray-900 sm:text-sm rounded-lg focus:ring-primary-500 focus:border-primary-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500"
- placeholder="Your organization name" />
+ placeholder="Your organization name"
+ onChange={(e) => {
+ const value = e.target.value;
+ formikHandlers.setFieldValue(
+ 'name',
+ value,
+ );
+ formikHandlers.setFieldTouched(
+ 'name',
+ true,
+ );
+
+ if (value.length > 50) {
+ formikHandlers.setFieldError(
+ 'name',
+ 'Organization name must be at most 50 characters',
+ );
+ } else {
+ formikHandlers.setFieldError(
+ 'name',
+ undefined,
+ );
+ }
+ }}
+ />
{
(formikHandlers?.errors?.name && formikHandlers?.touched?.name) &&
{formikHandlers?.errors?.name}
@@ -334,7 +355,31 @@ const EditOrgdetailsModal = (props: EditOrgdetailsModalProps) => {
value={formikHandlers.values.description}
as='textarea'
className="bg-gray-50 border border-gray-300 text-gray-900 sm:text-sm rounded-lg focus:ring-primary-500 focus:border-primary-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-primary-500 dark:focus:border-primary-500"
- placeholder="Description of your organization" />
+ placeholder="Description of your organization"
+ onChange={(e) => {
+ const value = e.target.value;
+ formikHandlers.setFieldValue(
+ 'description',
+ value,
+ );
+ formikHandlers.setFieldTouched(
+ 'description',
+ true,
+ );
+
+ if (value.length > 50) {
+ formikHandlers.setFieldError(
+ 'description',
+ 'Description must be at most 50 characters',
+ );
+ } else {
+ formikHandlers.setFieldError(
+ 'description',
+ undefined,
+ );
+ }
+ }}
+ />
{
(formikHandlers?.errors?.description && formikHandlers?.touched?.description) &&
{formikHandlers?.errors?.description}
diff --git a/src/components/organization/OrgDropDown.tsx b/src/components/organization/OrgDropDown.tsx
index 52aa56710..09182d64b 100644
--- a/src/components/organization/OrgDropDown.tsx
+++ b/src/components/organization/OrgDropDown.tsx
@@ -29,6 +29,7 @@ const OrgDropDown = () => {
const goToOrgDashboard = async (org: Organisation) => {
await removeFromLocalStorage(storageKeys.ECOSYSTEM_ID)
await removeFromLocalStorage(storageKeys.ECOSYSTEM_ROLE)
+ await removeFromLocalStorage(storageKeys.ORG_DETAILS)
await setOrgRoleDetails(org)
window.location.href = pathRoutes.organizations.dashboard;
diff --git a/src/components/organization/WalletSpinup.tsx b/src/components/organization/WalletSpinup.tsx
index c759ccb33..15baac481 100644
--- a/src/components/organization/WalletSpinup.tsx
+++ b/src/components/organization/WalletSpinup.tsx
@@ -28,7 +28,6 @@ interface Values {
}
interface ValuesShared {
- seed: string;
label: string;
}
@@ -37,36 +36,230 @@ enum AgentType {
DEDICATED = 'dedicated',
}
+interface ISharedAgentForm {
+ seeds: string
+ isCopied: boolean
+ copyTextVal: (e: any) => void
+ orgName: string
+ loading: boolean
+ submitSharedWallet: (values: ValuesShared) => void
+}
+
+interface IDedicatedAgentForm {
+ seeds: string
+ loading: boolean
+ submitDedicatedWallet: (values: Values) => void
+}
+
+const SharedAgentForm = ({ orgName, seeds, isCopied, loading, copyTextVal, submitSharedWallet }: ISharedAgentForm) => (
+
+
+
+
+
+
+ {seeds}
+
+
+
+
+
+
!value || !value.includes(' '))
+ .matches(
+ /^[A-Za-z0-9-][^ !"#$%&'()*+,-./:;<=>?@[\]^_`{|}~]*$/,
+ 'Wallet label must be alphanumeric only',
+ )
+ .min(2, 'Wallet label must be at least 2 characters')
+ .max(25, 'Wallet label must be at most 25 characters'),
+ })}
+ validateOnBlur
+ validateOnChange
+ enableReinitialize
+ onSubmit={(values: ValuesShared) => submitSharedWallet(values)}
+ >
+ {(formikHandlers): JSX.Element => (
+
+ )}
+
+
+);
+
+const DedicatedAgentForm = ({ seeds, loading, submitDedicatedWallet }: IDedicatedAgentForm) => (
+
?@[\]^_`{|}~]*$/,
+ 'Wallet name must be alphanumeric only',
+ )
+ .label('Wallet name'),
+ password: yup
+ .string()
+ .matches(
+ passwordRegex,
+ 'Password must contain one Capital, Special character',
+ )
+ .required('Wallet password is required')
+ .label('Wallet password'),
+ })}
+ validateOnBlur
+ validateOnChange
+ enableReinitialize
+ onSubmit={(values: Values) => submitDedicatedWallet(values)}
+ >
+ {(formikHandlers): JSX.Element => (
+
+ )}
+
+);
+
const WalletSpinup = (props: {
setWalletSpinupStatus: (flag: boolean) => void;
orgName: string
}) => {
const [agentType, setAgentType] = useState
(AgentType.SHARED);
-
const [loading, setLoading] = useState(false);
-
const [walletSpinStep, setWalletSpinStep] = useState(0);
-
const [success, setSuccess] = useState(null);
-
const [agentSpinupCall, setAgentSpinupCall] = useState(false);
-
const [failure, setFailure] = useState(null);
-
const [seeds, setSeeds] = useState('');
-
const [isCopied, setIsCopied] = useState(false);
+ // const [organization, setOrganization] = useState(props.orgName)
-
- const generateWalletname = () => {
-
- }
useEffect(() => {
setSeeds(nanoid(32));
- generateWalletname()
}, []);
- function copyTextVal(event: React.MouseEvent) {
+ const copyTextVal = (event: React.MouseEvent) => {
event.preventDefault()
setIsCopied(true);
@@ -183,202 +376,9 @@ const WalletSpinup = (props: {
console.log(`error-in-wallet-creation-process`, JSON.stringify(data));
});
- const DedicatedAgentForm = () => (
- ?@[\]^_`{|}~]*$/,
- 'Wallet name must be alphanumeric only',
- )
- .label('Wallet name'),
- password: yup
- .string()
- .matches(
- passwordRegex,
- 'Password must contain one Capital, Special character',
- )
- .required('Wallet password is required')
- .label('Wallet password'),
- })}
- validateOnBlur
- validateOnChange
- enableReinitialize
- onSubmit={(values: Values) => submitDedicatedWallet(values)}
- >
- {(formikHandlers): JSX.Element => (
-
- )}
-
- );
-
const orgName = props?.orgName ? props?.orgName?.split(" ").reduce((s, c) => (s.charAt(0).toUpperCase() + s.slice(1)) + (c.charAt(0).toUpperCase() + c.slice(1))
) : ""
- const SharedAgentForm = () => (
- !value || !value.includes(' '))
- .matches(
- /^[A-Za-z0-9-][^ !"#$%&'()*+,-./:;<=>?@[\]^_`{|}~]*$/,
- 'Wallet label must be alphanumeric only',
- )
- .min(2, 'Wallet label must be at least 2 characters')
- .max(25, 'Wallet label must be at most 25 characters'),
- })}
- validateOnBlur
- validateOnChange
- enableReinitialize
- onSubmit={(values: ValuesShared) => submitSharedWallet(values)}
- >
- {(formikHandlers): JSX.Element => (
-
- )}
-
- );
return (
@@ -444,9 +444,9 @@ const WalletSpinup = (props: {
{!agentSpinupCall ? (
agentType === AgentType.SHARED ? (
-
+
) : (
-
+
)
) : (