Merge pull request #147 from MeshJS/bug/drep-id

QSchlegel · web-flow · commit cb2995d84357 · 2025-10-08T16:32:58.000+02:00
fix(wallet): refine dRep ID retrieval logic
diff --git a/src/components/common/overall-layout/mobile-wrappers/wallet-data-loader-wrapper.tsx b/src/components/common/overall-layout/mobile-wrappers/wallet-data-loader-wrapper.tsx
@@ -152,7 +152,7 @@ export default function WalletDataLoaderWrapper({
 
   function dRepIds() {
     // Use multisig wallet DRep ID if available, otherwise fallback to appWallet
-    const dRepId = multisigWallet?.getDRepId() || appWallet?.dRepId;
+    const dRepId = multisigWallet?.getKeysByRole(3) ? multisigWallet?.getDRepId() : appWallet?.dRepId;
     if (!dRepId) return null;
     return getDRepIds(dRepId);
   }
diff --git a/src/hooks/common.ts b/src/hooks/common.ts
@@ -90,6 +90,7 @@ export function buildWallet(
   }
 
   //depricated -> only payment-script left in for compatibility
+  //uses unordered keys for payment script
   //Remove later when refactoring
   const nativeScript = {
     type: wallet.type ? wallet.type : "atLeast",

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ export default function WalletDataLoaderWrapper({`
`152`	`152`
`153`	`153`	`function dRepIds() {`
`154`	`154`	`// Use multisig wallet DRep ID if available, otherwise fallback to appWallet`
`155`		`- const dRepId = multisigWallet?.getDRepId() \|\| appWallet?.dRepId;`
	`155`	`+ const dRepId = multisigWallet?.getKeysByRole(3) ? multisigWallet?.getDRepId() : appWallet?.dRepId;`
`156`	`156`	`if (!dRepId) return null;`
`157`	`157`	`return getDRepIds(dRepId);`
`158`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,7 @@ export function buildWallet(`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`//depricated -> only payment-script left in for compatibility`
	`93`	`+ //uses unordered keys for payment script`
`93`	`94`	`//Remove later when refactoring`
`94`	`95`	`const nativeScript = {`
`95`	`96`	`type: wallet.type ? wallet.type : "atLeast",`