Merge branch 'develop' into simpler-input-styles

# Conflicts: # src/components/curator-actions/child-bounties/operations/BatchAllChildBountyCalls.svelte # src/routes/curator-actions/batch/create/+page.svelte # src/routes/curator-actions/batch/everything/+page.svelte
galaniprojects · Jan 24, 2025 · f10cce8 · f10cce8
2 parents d7d49f3 + c2cd6e4
commit f10cce8
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 497 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/curator-actions/ExternalLinks.svelte b/src/components/curator-actions/ExternalLinks.svelte
@@ -2,30 +2,35 @@
 	import LogoTreasuryWhite from '../svg/curator-actions-logos/LogoTreasuryWhite.svg';
 	import LogoSubscanWhite from '../svg/curator-actions-logos/LogoSubscanWhite.svg';
 	import LogoSubsquareWhite from '../svg/curator-actions-logos/LogoSubsquareWhite.svg';
+	import LogoPolkassemblyWhite from '../svg/curator-actions-logos/LogoPolkassemblyWhite.svg';
 	import ExternalLinksButton from '../ExternalLinksButton.svelte';
 
 	export let bountyId: number;
 	export let dimension = 6;
 </script>
 
-<div class="mr-4">
+<div class="space-x-2">
 	<ExternalLinksButton
 		url={`https://polkadot.subscan.io/bounty/${bountyId}`}
 		icon={LogoSubscanWhite}
 		{dimension}
 	/>
-</div>
-<div class="mr-4">
+
 	<ExternalLinksButton
 		url={`https://polkadot.dotreasury.com/#/bounties/${bountyId}`}
 		icon={LogoTreasuryWhite}
 		{dimension}
 	/>
-</div>
-<div class="mr-4">
+
 	<ExternalLinksButton
 		url={`https://polkadot.subsquare.io/treasury/bounty/${bountyId}`}
 		icon={LogoSubsquareWhite}
 		{dimension}
 	/>
+
+	<ExternalLinksButton
+		url={`https://polkadot.polkassembly.io/bounty/${bountyId}`}
+		icon={LogoPolkassemblyWhite}
+		{dimension}
+	/>
 </div>
diff --git a/src/components/curator-actions/child-bounties/ChildBountyCard.svelte b/src/components/curator-actions/child-bounties/ChildBountyCard.svelte
@@ -144,6 +144,11 @@
 		</div>
 
 		<div class="space-y-3 p-2 2xl:mr-[140px]">
+			<div class="flex justify-end">
+				<div class="hidden lg:flex lg:flex-row lg:items-center lg:justify-end lg:mr-2">
+					<ChildBountyExternalLinks dimension={6} childBountyId={childBounty.id} />
+				</div>
+			</div>
 			{#if $showAllCuratorOptions || (childBounty.status === 'Added' && $activeAccount?.address === parentBounty.curator)}
 				<div class="flex flex-col space-y-2 lg:flex-row lg:items-center lg:justify-end lg:gap-3">
 					<p class="text-xs lg:text-base lg:pt-2">Sub-curator</p>
@@ -169,12 +174,6 @@
 				</div>
 			{/if}
 
-			<div class="flex justify-end">
-				<div class="hidden lg:flex lg:flex-row lg:items-center lg:justify-end lg:mr-4">
-					<ChildBountyExternalLinks dimension={6} childBountyId={childBounty.id} />
-				</div>
-			</div>
-
 			{#if $showAllCuratorOptions || (childBounty.status === 'CuratorProposed' && childBounty.curator === $activeAccount?.address)}
 				<div class="flex flex-col space-y-2 lg:flex-row lg:items-center lg:justify-end lg:gap-3">
 					<p class="text-xs lg:text-base lg:pt-2">Sub-curator role</p>

diff --git a/src/components/curator-actions/child-bounties/ChildBountyExternalLinks.svelte b/src/components/curator-actions/child-bounties/ChildBountyExternalLinks.svelte
@@ -1,29 +1,29 @@
 <script lang="ts">
 	import LogoSubsquarePink from '../../svg/curator-actions-logos/LogoSubsquarePink.svg';
 	import LogoTreasuryPink from '../../svg/curator-actions-logos/LogoTreasuryPink.svg';
+	import LogoPolkassemblyPink from '../../svg/curator-actions-logos/LogoPolkassemblyPink.svg';
 	import ExternalLinksButton from '../../ExternalLinksButton.svelte';
 
 	export let dimension = 5;
 	export let childBountyId: number;
 </script>
 
-<div class="mr-4">
+<div class="space-x-3.5">
 	<ExternalLinksButton
 		url={`https://polkadot.dotreasury.com/#/child-bounties/${childBountyId}`}
 		icon={LogoTreasuryPink}
 		{dimension}
-		backgroundColor="white"
-		textColor="primary"
-		buttonStyle="bg-accent text-white"
 	/>
-</div>
-<div class="mr-4">
+
 	<ExternalLinksButton
 		url={`https://polkadot.subsquare.io/treasury/child-bounties/${childBountyId}`}
 		icon={LogoSubsquarePink}
 		{dimension}
-		backgroundColor="white"
-		textColor="primary"
-		buttonStyle="bg-accent text-white"
+	/>
+
+	<ExternalLinksButton
+		url={`https://polkadot.polkassembly.io/child_bounty/${childBountyId}`}
+		icon={LogoPolkassemblyPink}
+		{dimension}
 	/>
 </div>
diff --git a/src/components/svg/curator-actions-logos/LogoPolkassemblyPink.svg b/src/components/svg/curator-actions-logos/LogoPolkassemblyPink.svg
diff --git a/src/components/svg/curator-actions-logos/LogoPolkassemblyWhite.svg b/src/components/svg/curator-actions-logos/LogoPolkassemblyWhite.svg
diff --git a/src/routes/curator-actions/batch/create/+page.svelte b/src/routes/curator-actions/batch/create/+page.svelte
@@ -105,6 +105,12 @@
 									oninput={validateBountyValue}
 									inputmode="decimal"
 								/>
+								<span
+									class="border border-accent absolute right-9 top-9 transform -translate-y-1/2 h-6"
+								></span>
+								<span class="absolute right-2 top-[26px]">
+									<img src={PolkaCoin} width="20" height="20" alt="PolkaCoin" />
+								</span>
 							</label>
 
 							<label>

diff --git a/src/routes/curator-actions/batch/everything/+page.svelte b/src/routes/curator-actions/batch/everything/+page.svelte
@@ -166,6 +166,12 @@
 									oninput={validateBountyValue}
 									inputmode="decimal"
 								/>
+								<span
+									class="border border-accent absolute right-9 top-9 transform -translate-y-1/2 h-6"
+								></span>
+								<span class="absolute right-2 top-[26px]">
+									<img src={PolkaCoin} width="20" height="20" alt="PolkaCoin" />
+								</span>
 							</label>
 
 							<label>
@@ -188,6 +194,12 @@
 									oninput={validateFee}
 									inputmode="decimal"
 								/>
+								<span
+									class="border border-accent absolute right-9 top-9 transform -translate-y-1/2 h-6"
+								></span>
+								<span class="absolute right-2 top-[26px]">
+									<img src={PolkaCoin} width="20" height="20" alt="PolkaCoin" />
+								</span>
 							</label>
 
 							<label>