From 0d7777492c9fda02df39d6ed73f649a84332d9fb Mon Sep 17 00:00:00 2001
From: RedBeardEth <90423049+RedBeardEth@users.noreply.github.com>
Date: Wed, 11 Dec 2024 20:40:18 +1100
Subject: [PATCH] update earthern shard name, fix travel time on bridge

---
 landing/.env.production                                      | 4 ++--
 .../public/resource_addresses/local/resource_addresses.json  | 2 +-
 .../resource_addresses/mainnet/resource_addresses.json       | 2 +-
 .../resource_addresses/sepolia/resource_addresses.json       | 2 +-
 landing/src/components/modules/bridge-fees.tsx               | 5 +++--
 landing/src/components/modules/eternum-conditions-modal.tsx  | 4 ++--
 landing/src/dojo/setup.ts                                    | 1 +
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/landing/.env.production b/landing/.env.production
index 89ff8c9fe..1d9dc395b 100644
--- a/landing/.env.production
+++ b/landing/.env.production
@@ -4,13 +4,13 @@ VITE_PUBLIC_WORLD_ADDRESS="0x5013b17c43a2b664ec2a38aa45f6d891db1188622ec7cf32041
 VITE_PUBLIC_ACCOUNT_CLASS_HASH="0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2"
 VITE_PUBLIC_FEE_TOKEN_ADDRESS=0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7
 
-VITE_PUBLIC_TORII=https://api.cartridge.gg/x/eternum-mainnet/torii
+VITE_PUBLIC_TORII=https://api.cartridge.gg/x/realms-world-5/torii
 VITE_PUBLIC_NODE_URL=https://api.cartridge.gg/x/starknet/mainnet
 VITE_PUBLIC_DEV=false
 VITE_PUBLIC_GAME_VERSION="v1.0.0-rc0"
 VITE_PUBLIC_SHOW_FPS=false
 VITE_PUBLIC_GRAPHICS_DEV=false
-VITE_PUBLIC_TORII_RELAY=/dns4/api.cartridge.gg/tcp/443/x-parity-wss/%2Fx%2Frealms-world-03%2Ftorii%2Fwss
+VITE_PUBLIC_TORII_RELAY=/dns4/api.cartridge.gg/tcp/443/x-parity-wss/%2Fx%2Frealms-world-5%2Ftorii%2Fwss
 VITE_SEASON_PASS_ADDRESS=0x057675b9c0bd62b096a2e15502a37b290fa766ead21c33eda42993e48a714b80
 VITE_REALMS_ADDRESS=0x07ae27a31bb6526e3de9cf02f081f6ce0615ac12a6d7b85ee58b8ad7947a2809
 VITE_LORDS_ADDRESS=0x0124aeb495b947201f5fac96fd1138e326ad86195b98df6dec9009158a533b49
diff --git a/landing/public/resource_addresses/local/resource_addresses.json b/landing/public/resource_addresses/local/resource_addresses.json
index 12c2217b8..ac9d26218 100644
--- a/landing/public/resource_addresses/local/resource_addresses.json
+++ b/landing/public/resource_addresses/local/resource_addresses.json
@@ -22,7 +22,7 @@
   "ETHEREALSILICA": [21, "0x72fb88593bd78eb19f1514f6a2537b943d23db15ad067e85678f6e9a52345c5"],
   "DRAGONHIDE": [22, "0xbeaedcc84e52b9f6197ad5cb5b441fac304afdd036438c208ae3928dd30de0"],
   "DEMONHIDE": [28, "0x3f7d97969da364fd2ac0da5b6a877e6c4d4bfade4b3db50561abe02aac3ea48"],
-  "EARTHENSHARD": [29, "0x10cb48622578710d600c1d8bf4942035f573d8f1ee95c8a4d3d242139441dbe"],
+  "ANCIENT_FRAGMENT": [29, "0x10cb48622578710d600c1d8bf4942035f573d8f1ee95c8a4d3d242139441dbe"],
   "DONKEY": [249, "0x1d1542407040c2dce32b3ea35b06c627d4c7c0c6b133972fb903a71fc96156d"],
   "KNIGHT": [250, "0x25cebc9ae778dc52ba67b722406586cbabcfd752dda5c3aa541313189617806"],
   "CROSSBOWMAN": [251, "0x32ffb922c07155cad08b60a98ce2f660d25b818945d111dc184c7da31cd118f"],
diff --git a/landing/public/resource_addresses/mainnet/resource_addresses.json b/landing/public/resource_addresses/mainnet/resource_addresses.json
index a497b8a06..2609a24b0 100644
--- a/landing/public/resource_addresses/mainnet/resource_addresses.json
+++ b/landing/public/resource_addresses/mainnet/resource_addresses.json
@@ -22,7 +22,7 @@
   "ETHEREALSILICA": [21, "0x68b6e23cbbd58a644700f55e96c83580921e9f521b6e5175396b53ba7910e7d"],
   "DRAGONHIDE": [22, "0x3bf856515bece3c93f5061b7941b8645f817a0acab93c758b8c7b4bc0afa3c6"],
   "DEMONHIDE": [28, "0x3b847fbef9d344ba968edc945100e6ab0258a4b1b91f8665f85a3d814c3e4d4"],
-  "EARTHENSHARD": [29, "0x0695b08ecdfdd828c2e6267da62f59e6d7543e690ef56a484df25c8566b332a5"],
+  "ANCIENT_FRAGMENT": [29, "0x0695b08ecdfdd828c2e6267da62f59e6d7543e690ef56a484df25c8566b332a5"],
   "DONKEY": [249, "0x264be95a4a2ace20add68cb321acdccd2f9f8440ee1c7abd85da44ddab01085"],
   "KNIGHT": [250, "0xac965f9e67164723c16735a9da8dbc9eb8e43b1bd0323591e87c056badf606"],
   "CROSSBOWMAN": [251, "0x67e4ac00a241be06ba6afc11fa2715ec7da0c42c05a67ef6ecfcfeda725aaa8"],
diff --git a/landing/public/resource_addresses/sepolia/resource_addresses.json b/landing/public/resource_addresses/sepolia/resource_addresses.json
index 88feedb29..bda4f2e8e 100644
--- a/landing/public/resource_addresses/sepolia/resource_addresses.json
+++ b/landing/public/resource_addresses/sepolia/resource_addresses.json
@@ -22,7 +22,7 @@
   "ETHEREALSILICA": [21, "0x25eb12bb5298a2b14ceb9109086d330810d55c5e9a8c17e60fc956453b30d14"],
   "DRAGONHIDE": [22, "0x463ebcc1b9ac911930a471fb9b608e9e7ca07ed81aab66f8889dd45b41c28b2"],
   "DEMONHIDE": [28, "0x9613c7e4c04929c616a81f150006bc1a96bb77426851d300ef3dfaf2d0c318"],
-  "EARTHENSHARD": [29, "0x403c764fd76f926eec43218f46f79cfb5fe86dfeb1ae76010027697f65733f1"],
+  "ANCIENT_FRAGMENT": [29, "0x403c764fd76f926eec43218f46f79cfb5fe86dfeb1ae76010027697f65733f1"],
   "DONKEY": [249, "0x6b6c4437543e46a8a80835fa50643fbd32275d3836396d8cd9c1d7c987f4ea9"],
   "KNIGHT": [250, "0x298cba6b152d04fd54195dbae0e74512ff740d14946d2d65f26d0c039feffe2"],
   "CROSSBOWMAN": [251, "0x116ce3b8c4a70f61e0131cc8681bc50a5eb35276e7985c07e3a508c2eb25f8f"],
diff --git a/landing/src/components/modules/bridge-fees.tsx b/landing/src/components/modules/bridge-fees.tsx
index a9fd6c56b..f64d61d8e 100644
--- a/landing/src/components/modules/bridge-fees.tsx
+++ b/landing/src/components/modules/bridge-fees.tsx
@@ -86,7 +86,7 @@ export const BridgeFees = ({
           <div>{formatFee(feesForAllResources.reduce((sum, fees) => sum + Number(fees.totalFee), 0))} units</div>
         </Button>
       </CollapsibleTrigger>
-      <CollapsibleContent className="flex flex-col gap-4 pt-4">
+      <CollapsibleContent className="flex flex-col gap-4 py-4">
         {feesForAllResources.map((fees) => {
           const resourceName = ResourcesIds[fees.id as keyof typeof ResourcesIds];
           return (
@@ -114,10 +114,11 @@ export const BridgeFees = ({
                 </div>
                 <div>{fees.seasonPoolFee}</div>
               </div>
-              <div className="flex justify-between text-xs">
+              <div className="flex justify-between text-xs mb-3">
                 <div>Client Fees ({calculateBridgeFeeDisplayPercent(bridgeConfig.client_fee_on_dpt_percent)}%)</div>
                 <div>{fees.clientFee}</div>
               </div>
+              <hr />
             </div>
           );
         })}
diff --git a/landing/src/components/modules/eternum-conditions-modal.tsx b/landing/src/components/modules/eternum-conditions-modal.tsx
index de0832d1e..bc96c6562 100644
--- a/landing/src/components/modules/eternum-conditions-modal.tsx
+++ b/landing/src/components/modules/eternum-conditions-modal.tsx
@@ -11,7 +11,7 @@ interface EternumConditionsModalProps {
 }
 
 export function EternumConditionsModal({ open, onOpenChange }: EternumConditionsModalProps) {
-  const [hasAcceptedTerms, setHasAcceptedTerms] = useState(false);
+  const [hasAcceptedTerms, setHasAcceptedTerms] = useState<boolean | null>(null);
   const [currentStep, setCurrentStep] = useState(1);
 
   useEffect(() => {
@@ -141,7 +141,7 @@ export function EternumConditionsModal({ open, onOpenChange }: EternumConditions
     </>
   );
 
-  if (hasAcceptedTerms) {
+  if (hasAcceptedTerms || hasAcceptedTerms === null) {
     return null;
   }
 
diff --git a/landing/src/dojo/setup.ts b/landing/src/dojo/setup.ts
index ce79c02e9..cb9960f65 100644
--- a/landing/src/dojo/setup.ts
+++ b/landing/src/dojo/setup.ts
@@ -47,6 +47,7 @@ export async function setup({ ...config }: DojoConfig) {
     "OwnedResourcesTracker",
     "Weight",
     "Resource",
+    "SpeedConfig"
   ]) as any;
 
   const filteredEvents = getFilteredEvents([