From 71868f8fc2aa385df41314de704abd407837b6f2 Mon Sep 17 00:00:00 2001
From: Bob <wastchenko.constantin@gmail.com>
Date: Wed, 25 Dec 2024 12:23:34 +0100
Subject: [PATCH 1/2] Add resource filter for contributions

---
 .../hyperstructures/ContributionSummary.tsx   | 83 +++++++++++++------
 client/src/ui/elements/SelectResource.tsx     |  5 +-
 client/src/ui/utils/utils.tsx                 |  4 +-
 3 files changed, 63 insertions(+), 29 deletions(-)

diff --git a/client/src/ui/components/hyperstructures/ContributionSummary.tsx b/client/src/ui/components/hyperstructures/ContributionSummary.tsx
index 71ef6a9cb..9e16b7f89 100644
--- a/client/src/ui/components/hyperstructures/ContributionSummary.tsx
+++ b/client/src/ui/components/hyperstructures/ContributionSummary.tsx
@@ -1,9 +1,10 @@
 import { useContributions } from "@/hooks/helpers/useContributions";
 import { useRealm } from "@/hooks/helpers/useRealm";
 import { ResourceIcon } from "@/ui/elements/ResourceIcon";
-import { currencyIntlFormat, divideByPrecision, formatNumber } from "@/ui/utils/utils";
+import { SelectResource } from "@/ui/elements/SelectResource";
+import { copyPlayerAddressToClipboard, currencyIntlFormat, divideByPrecision, formatNumber } from "@/ui/utils/utils";
 import { ContractAddress, ID, ResourcesIds } from "@bibliothecadao/eternum";
-import { useState } from "react";
+import { useMemo, useState } from "react";
 
 export const ContributionSummary = ({
   hyperstructureEntityId,
@@ -46,15 +47,31 @@ export const ContributionSummary = ({
   );
 
   const [showContributions, setShowContributions] = useState(false);
+  const [selectedResource, setSelectedResource] = useState<number | null>(null);
 
   // Calculate percentages and sort contributors
-  const sortedContributors = Object.entries(groupedContributions)
-    .map(([playerAddress, resources]) => ({
-      playerAddress,
-      resources,
-      percentage: getContributionsTotalPercentage(hyperstructureEntityId, resourceContributions[playerAddress]) * 100,
-    }))
-    .sort((a, b) => b.percentage - a.percentage);
+  const sortedContributors = useMemo(
+    () =>
+      Object.entries(groupedContributions)
+        .map(([playerAddress, resources]) => ({
+          playerAddress,
+          resources,
+          percentage:
+            getContributionsTotalPercentage(hyperstructureEntityId, resourceContributions[playerAddress]) * 100,
+        }))
+        .filter(({ resources }) =>
+          selectedResource ? resources[selectedResource] > 0n : Object.values(resources).some((amount) => amount > 0n),
+        )
+        .sort((a, b) => {
+          if (selectedResource) {
+            const amountA = a.resources[selectedResource] || 0n;
+            const amountB = b.resources[selectedResource] || 0n;
+            return amountA > amountB ? -1 : amountA < amountB ? 1 : 0;
+          }
+          return b.percentage - a.percentage;
+        }),
+    [groupedContributions, selectedResource],
+  );
 
   return (
     <div className={`space-y-2 ${className || ""}`}>
@@ -66,24 +83,38 @@ export const ContributionSummary = ({
         <span className={`transform transition-transform ${showContributions ? "rotate-90" : ""}`}>➤</span>
       </div>
       {showContributions && (
-        <div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-2">
-          {sortedContributors.map(({ playerAddress, resources, percentage }) => (
-            <div key={playerAddress} className="bg-gold/10 p-1 rounded">
-              <div className="flex flex-row mb-1 justify-between mr-1 items-end">
-                <div className="text-sm font-bold">{getAddressName(ContractAddress(playerAddress))}</div>
-                <div className="text-xs">{formatNumber(percentage, 2)}%</div>
-              </div>
-              <div className="flex flex-wrap gap-2">
-                {Object.entries(resources).map(([resourceType, amount]) => (
-                  <div key={resourceType} className="flex items-center">
-                    <ResourceIcon size="xs" resource={ResourcesIds[Number(resourceType)]} />
-                    <span className="ml-1 text-xs">{currencyIntlFormat(divideByPrecision(Number(amount)))}</span>
+        <>
+          <SelectResource onSelect={(resourceId) => setSelectedResource(resourceId)} />
+          <div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-2">
+            {sortedContributors.map(({ playerAddress, resources, percentage }) => {
+              const addressName = getAddressName(ContractAddress(playerAddress)) || "Unknown";
+
+              return (
+                <div key={playerAddress} className="bg-gold/10 p-1 rounded">
+                  <div className="flex flex-row mb-1 justify-between mr-1 items-end">
+                    <div
+                      onClick={() => copyPlayerAddressToClipboard(ContractAddress(playerAddress), addressName, true)}
+                      className="text-sm font-bold cursor-pointer hover:text-gold/50"
+                    >
+                      {addressName}
+                    </div>
+                    <div className="text-xs">{formatNumber(percentage, 2)}%</div>
+                  </div>
+                  <div className="flex flex-wrap gap-2">
+                    {Object.entries(resources)
+                      .filter(([resourceType]) => (selectedResource ? Number(resourceType) === selectedResource : true))
+                      .map(([resourceType, amount]) => (
+                        <div key={resourceType} className="flex items-center">
+                          <ResourceIcon size="xs" resource={ResourcesIds[Number(resourceType)]} />
+                          <span className="ml-1 text-xs">{currencyIntlFormat(divideByPrecision(Number(amount)))}</span>
+                        </div>
+                      ))}
                   </div>
-                ))}
-              </div>
-            </div>
-          ))}
-        </div>
+                </div>
+              );
+            })}
+          </div>
+        </>
       )}
     </div>
   );
diff --git a/client/src/ui/elements/SelectResource.tsx b/client/src/ui/elements/SelectResource.tsx
index e551bf468..7d6b7c21c 100644
--- a/client/src/ui/elements/SelectResource.tsx
+++ b/client/src/ui/elements/SelectResource.tsx
@@ -76,7 +76,10 @@ export const SelectResource: React.FC<SelectResourceProps> = ({ onSelect, classN
           "my-auto w-8 mx-auto hover:fill-gold/50 fill-gold hover:scale-125 hover:animate-pulse duration-300 transition-all",
           { "pointer-events-none fill-gold/50": !selectedResource },
         )}
-        onClick={() => setSelectedResource("")}
+        onClick={() => {
+          setSelectedResource("");
+          onSelect(null);
+        }}
       />
       <Select
         open={open}
diff --git a/client/src/ui/utils/utils.tsx b/client/src/ui/utils/utils.tsx
index 69b08240b..faa2c3326 100644
--- a/client/src/ui/utils/utils.tsx
+++ b/client/src/ui/utils/utils.tsx
@@ -258,9 +258,9 @@ export const formatTime = (
   return parts.join(" ");
 };
 
-export const copyPlayerAddressToClipboard = (address: ContractAddress, name: string) => {
+export const copyPlayerAddressToClipboard = (address: ContractAddress, name: string, hex: boolean = false) => {
   navigator.clipboard
-    .writeText(address.toString())
+    .writeText(hex ? toHexString(address) : address.toString())
     .then(() => {
       alert(`Address of ${name} copied to clipboard`);
     })

From 813bb2da737127edca6d1249b796a51e10c3cdad Mon Sep 17 00:00:00 2001
From: Bob <wastchenko.constantin@gmail.com>
Date: Wed, 25 Dec 2024 14:51:36 +0100
Subject: [PATCH 2/2] Change % for specific resource contribution

---
 .../hyperstructures/ContributionSummary.tsx      | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/client/src/ui/components/hyperstructures/ContributionSummary.tsx b/client/src/ui/components/hyperstructures/ContributionSummary.tsx
index 9e16b7f89..3bc4ae641 100644
--- a/client/src/ui/components/hyperstructures/ContributionSummary.tsx
+++ b/client/src/ui/components/hyperstructures/ContributionSummary.tsx
@@ -16,6 +16,9 @@ export const ContributionSummary = ({
   const { getContributions, getContributionsTotalPercentage } = useContributions();
   const { getAddressName } = useRealm();
 
+  const [showContributions, setShowContributions] = useState(false);
+  const [selectedResource, setSelectedResource] = useState<number | null>(null);
+
   type Resource = {
     amount: number;
     resourceId: number;
@@ -37,18 +40,17 @@ export const ContributionSummary = ({
 
   const resourceContributions: Record<string, Resource[]> = Object.entries(groupedContributions).reduce(
     (acc, [playerAddress, resources]) => {
-      acc[playerAddress] = Object.entries(resources).map(([resourceType, amount]) => ({
-        amount: Number(amount),
-        resourceId: Number(resourceType),
-      }));
+      acc[playerAddress] = Object.entries(resources)
+        .filter(([resourceType]) => (selectedResource ? Number(resourceType) === selectedResource : true))
+        .map(([resourceType, amount]) => ({
+          amount: Number(amount),
+          resourceId: Number(resourceType),
+        }));
       return acc;
     },
     {} as Record<string, Resource[]>,
   );
 
-  const [showContributions, setShowContributions] = useState(false);
-  const [selectedResource, setSelectedResource] = useState<number | null>(null);
-
   // Calculate percentages and sort contributors
   const sortedContributors = useMemo(
     () =>