merge changes from dev to qa (#700)

* [Deno Deploy] Update .github/workflows/deploy.yml * feat: support no ledger (#689) * wip: implemented ui for method selection Signed-off-by: bhavanakarwade <[email protected]> * wip: modified no ledger screen Signed-off-by: bhavanakarwade <[email protected]> * feat: modified ui for create did popup Signed-off-by: bhavanakarwade <[email protected]> * refactor: worked on error handling Signed-off-by: bhavanakarwade <[email protected]> * fix: validations on create did popup Signed-off-by: bhavanakarwade <[email protected]> * refactor: mapping function Signed-off-by: bhavanakarwade <[email protected]> * fix: resolved sonarlint issues Signed-off-by: bhavanakarwade <[email protected]> * fix: input box issues Signed-off-by: bhavanakarwade <[email protected]> * refactor: handled role wise conditions Signed-off-by: bhavanakarwade <[email protected]> * fix: resolved code duplication errors Signed-off-by: bhavanakarwade <[email protected]> * fix: enum values Signed-off-by: bhavanakarwade <[email protected]> --------- Signed-off-by: bhavanakarwade <[email protected]> * fixed CSS and avatar issues (#696) * fix:css issues Signed-off-by: pranalidhanavade <[email protected]> * fix:sonarcloud issues Signed-off-by: pranalidhanavade <[email protected]> --------- Signed-off-by: pranalidhanavade <[email protected]> * feat: support no ledger (#697) * wip: implemented ui for method selection Signed-off-by: bhavanakarwade <[email protected]> * wip: modified no ledger screen Signed-off-by: bhavanakarwade <[email protected]> * feat: modified ui for create did popup Signed-off-by: bhavanakarwade <[email protected]> * refactor: worked on error handling Signed-off-by: bhavanakarwade <[email protected]> * fix: validations on create did popup Signed-off-by: bhavanakarwade <[email protected]> * refactor: mapping function Signed-off-by: bhavanakarwade <[email protected]> * fix: resolved sonarlint issues Signed-off-by: bhavanakarwade <[email protected]> * fix: input box issues Signed-off-by: bhavanakarwade <[email protected]> * refactor: handled role wise conditions Signed-off-by: bhavanakarwade <[email protected]> * fix: resolved code duplication errors Signed-off-by: bhavanakarwade <[email protected]> * fix: enum values Signed-off-by: bhavanakarwade <[email protected]> * fix: added loading chnages Signed-off-by: bhavanakarwade <[email protected]> * fix: ledgerconfig object changes Signed-off-by: bhavanakarwade <[email protected]> * fix: resolved type errors Signed-off-by: bhavanakarwade <[email protected]> --------- Signed-off-by: bhavanakarwade <[email protected]> * refactor: responsiveness of the component (#699) * wip: implemented ui for method selection Signed-off-by: bhavanakarwade <[email protected]> * wip: modified no ledger screen Signed-off-by: bhavanakarwade <[email protected]> * feat: modified ui for create did popup Signed-off-by: bhavanakarwade <[email protected]> * refactor: worked on error handling Signed-off-by: bhavanakarwade <[email protected]> * fix: validations on create did popup Signed-off-by: bhavanakarwade <[email protected]> * refactor: mapping function Signed-off-by: bhavanakarwade <[email protected]> * fix: resolved sonarlint issues Signed-off-by: bhavanakarwade <[email protected]> * fix: input box issues Signed-off-by: bhavanakarwade <[email protected]> * refactor: handled role wise conditions Signed-off-by: bhavanakarwade <[email protected]> * fix: resolved code duplication errors Signed-off-by: bhavanakarwade <[email protected]> * fix: enum values Signed-off-by: bhavanakarwade <[email protected]> * fix: added loading chnages Signed-off-by: bhavanakarwade <[email protected]> * fix: ledgerconfig object changes Signed-off-by: bhavanakarwade <[email protected]> * fix: resolved type errors Signed-off-by: bhavanakarwade <[email protected]> * refactor: modified responsiveness of the component Signed-off-by: bhavanakarwade <[email protected]> --------- Signed-off-by: bhavanakarwade <[email protected]> --------- Signed-off-by: bhavanakarwade <[email protected]> Signed-off-by: pranalidhanavade <[email protected]> Signed-off-by: Krishna Waske <[email protected]> Co-authored-by: deno-deploy[bot] <75045203+deno-deploy[bot]@users.noreply.github.com> Co-authored-by: bhavanakarwade <[email protected]> Co-authored-by: pranalidhanavade <[email protected]>
credebl · Jun 14, 2024 · c599a02 · c599a02
1 parent 0818038
commit c599a02
Show file tree

Hide file tree

Showing 21 changed files with 1,257 additions and 984 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -48,6 +48,7 @@
 		"dom-to-image": "^2.6.0",
 		"downloadjs": "^1.4.7",
 		"eslint": "^8.57.0",
+		"ethers": "^6.12.1",
 		"flowbite": "^2.3.0",
 		"flowbite-react": "^0.4.11",
 		"flowbite-typography": "^1.0.3",

diff --git a/src/common/enums.ts b/src/common/enums.ts
@@ -101,8 +101,17 @@ export enum BulkIssuanceStatus {
 }
 
 export enum DidMethod {
-    INDY = 'indy',
-    KEY = 'key',
-    WEB = 'web',
-    POLYGON = 'polygon'
+    INDY = 'did:indy',
+    KEY = 'did:key',
+    WEB = 'did:web',
+    POLYGON = 'did:polygon'
+}
+
+export enum Network {
+	TESTNET = 'testnet',
+	MAINNET = 'mainnet'
+}
+
+export enum CommonConstants {
+	BALANCELIMIT = 0.01
 }
diff --git a/src/components/Authentication/ResetPassword.tsx b/src/components/Authentication/ResetPassword.tsx
@@ -26,6 +26,37 @@ interface passwordValues {
 	confirmPassword: string;
 }
 
+
+const EyeIconVisible = () => (
+	<svg
+		className="h-6 w-6 text-black"
+		viewBox="0 0 24 24"
+		fill="none"
+		stroke="currentColor"
+		strokeWidth="2"
+		strokeLinecap="round"
+		strokeLinejoin="round"
+	>
+		<path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z" />
+		<circle cx="12" cy="12" r="3" />
+	</svg>
+);
+
+const EyeIconInvisible = () => (
+	<svg
+		className="h-6 w-6 text-black"
+		viewBox="0 0 24 24"
+		fill="none"
+		stroke="currentColor"
+		strokeWidth="2"
+		strokeLinecap="round"
+		strokeLinejoin="round"
+	>
+		<path d="M17.94 17.94A10.07 10.07 0 0 1 12 20c-7 0-11-8-11-8a18.45 18.45 0 0 1 5.06-5.94M9.9 4.24A9.12 9.12 0 0 1 12 4c7 0 11 8 11 8a18.5 18.5 0 0 1-2.16 3.19m-6.72-1.07a3 3 0 1 1-4.24-4.24" />
+		<line x1="1" y1="1" x2="23" y2="23" />
+	</svg>
+);
+
 const ResetPassword = () => {
 	const [loading, setLoading] = useState<boolean>(false);
 	const [erroMsg, setErrMsg] = useState<string | null>(null);
@@ -189,9 +220,10 @@ const ResetPassword = () => {
 														className="bg-transparent absolute right-2 top-1/2 transform -translate-y-1/2 text-gray-500 dark:text-white hover:text-gray-800 dark:hover:text-white"
 													>
 														{passwordVisible ? (
-															<PassInvisible />
+															<EyeIconVisible />
 														) : (
-															<PassVisible />
+															<EyeIconInvisible />
+
 														)}
 													</button>
 												</div>

diff --git a/src/components/EcosystemInvite/EcoInvitationList.tsx b/src/components/EcosystemInvite/EcoInvitationList.tsx
@@ -9,9 +9,9 @@ const EcoInvitationList = (props: InvitationProps) => {
 		<div className="flex space-x-2">
 			<div className="mr-2">
 				{logoUrl ? (
-					<CustomAvatar size="60" src={logoUrl} />
+					<CustomAvatar size="60px" src={logoUrl} />
 				) : (
-					<CustomAvatar size="70" name={name} />
+					<CustomAvatar size="70px" name={name} />
 				)}
 			</div>
 

diff --git a/src/components/organization/EditOrgdetailsModal.tsx b/src/components/organization/EditOrgdetailsModal.tsx
@@ -14,7 +14,7 @@ import type { EditOrgdetailsModalProps, ILogoImage, Organisation, Values } from
 import { processImage } from '../../utils/processImage';
 import FormikErrorMessage from '../../commonComponents/formikerror/index'
 import CustomSpinner from '../CustomSpinner';
-
+	
 interface IUpdateOrgPayload {
 	orgId: string | undefined;
 	name: string;