diff --git a/client/dev-dist/sw.js b/client/dev-dist/sw.js
index 096d6781..f5cd8392 100644
--- a/client/dev-dist/sw.js
+++ b/client/dev-dist/sw.js
@@ -82,7 +82,7 @@ define(['./workbox-20a2f87f'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
-    "revision": "0.shqbum89m38"
+    "revision": "0.o26d1okn5o8"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {
diff --git a/client/src/components/FlappyBeasts/flappyBeasts.tsx b/client/src/components/FlappyBeasts/flappyBeasts.tsx
index e16afd11..5a0215e8 100644
--- a/client/src/components/FlappyBeasts/flappyBeasts.tsx
+++ b/client/src/components/FlappyBeasts/flappyBeasts.tsx
@@ -62,6 +62,7 @@ const BIRD_COLLIDER_OFFSET_Y = (BIRD_HEIGHT - BIRD_COLLIDER_HEIGHT) / 2;
 
 // Types and Interfaces
 import { FlappyBirdRefHandle, FlappyBirdProps } from '../../types/components';
+import { Account } from 'starknet';
 
 const FlappyBirdMiniGame = forwardRef<FlappyBirdRefHandle, FlappyBirdProps>(({
     className = '',
@@ -168,20 +169,11 @@ const FlappyBirdMiniGame = forwardRef<FlappyBirdRefHandle, FlappyBirdProps>(({
             await handleAction(
               "SaveGameResults", 
               async () => {
-                await client.player.updatePlayerTotalPoints(
-                  account,
-                  score
-                )
-                await client.player.updatePlayerMinigameHighestScore(
-                  account,
-                  score,
-                  2
-                )
-                await client.player.addOrUpdateFoodAmount(
-                  account,
-                  foodId,
-                  foodCollected
-                )
+                await client.player.updatePlayerTotalPoints(account, score);
+                const txtest = await client.achieve.achievePlayerNewTotalPoints(account);
+                console.info('achievePlayerNewTotalPoints fkaooy', txtest);
+                await client.player.updatePlayerMinigameHighestScore(account, score, 2);
+                await client.player.addOrUpdateFoodAmount(account, foodId, foodCollected);
             });
             return true;
           } else {
@@ -217,15 +209,16 @@ const FlappyBirdMiniGame = forwardRef<FlappyBirdRefHandle, FlappyBirdProps>(({
       };
 
     // Handle game over
-    const handleGameEnd = () => {
+    const handleGameEnd = async () => {
 
       const score = currentScoreRef.current;
       setFinalScore(score);
       const dojoHighScore = myScoreFlappyBird.length > 0 ? myScoreFlappyBird[0]?.score : 0;
       const actualHighScore = Math.max(dojoHighScore, currentHighScore);
-      
       if (score > actualHighScore) {
           setCurrentHighScore(score);
+          const tx = await client.achieve.achieveFlappyBeastHighscore(account as Account, score);
+          console.info('tx flappy highscore', tx);
       } else {
           setCurrentHighScore(actualHighScore);
       }
@@ -893,6 +886,8 @@ const FlappyBirdMiniGame = forwardRef<FlappyBirdRefHandle, FlappyBirdProps>(({
             {currentScreen === 'sharing' && (
                 <div className="modal-overlay">
                     <ShareProgress
+                        account={account}
+                        client={client}
                         isOpen={isShareModalOpen}
                         onClose={() => {
                             setIsShareModalOpen(false);
diff --git a/client/src/components/Header/index.tsx b/client/src/components/Header/index.tsx
index 3c66eb65..bf8b0d22 100644
--- a/client/src/components/Header/index.tsx
+++ b/client/src/components/Header/index.tsx
@@ -29,6 +29,7 @@ import download from "../../assets/img/icon-download.svg";
 
 // Styles
 import './main.css';
+import { useDojoSDK } from "@dojoengine/sdk/react";
 
 // Constants
 const WEBSITE_URL = 'https://website.bytebeasts.games';
@@ -56,8 +57,9 @@ const Header: React.FC<HeaderProps> = ({ tamagotchiStats }) => {
   // Hooks
   const { beastsData: beasts } = useBeasts();
   const { player } = usePlayer();
+  const { client } = useDojoSDK();
   const location = useLocation();
-  const { connector } = useAccount();
+  const { account, connector } = useAccount();
   const [buttonSound] = useSound(buttonClick, { volume: SOUND_VOLUME, preload: true });
 
   // Derived state
@@ -176,6 +178,8 @@ const Header: React.FC<HeaderProps> = ({ tamagotchiStats }) => {
 
       {tamagotchiStats && (
         <ShareProgress
+          account={account}
+          client={client}
           isOpen={isShareModalOpen}
           onClose={() => setIsShareModalOpen(false)}
           type="beast"
diff --git a/client/src/components/SkyJumpMiniGame/index.tsx b/client/src/components/SkyJumpMiniGame/index.tsx
index d98878b8..817d82bb 100644
--- a/client/src/components/SkyJumpMiniGame/index.tsx
+++ b/client/src/components/SkyJumpMiniGame/index.tsx
@@ -26,6 +26,7 @@ import { InputHandler } from './inputHandler';
 import RestartIcon from '../../assets/img/icon-restart.svg'; 
 
 import './main.css'; 
+import { Account } from 'starknet';
 
 const CanvasSkyJumpGame = forwardRef<SkyJumpGameRefHandle, CanvasSkyJumpGameProps>(({
   className = '',
@@ -84,7 +85,7 @@ const CanvasSkyJumpGame = forwardRef<SkyJumpGameRefHandle, CanvasSkyJumpGameProp
   }, [onScoreUpdate]);
 
   // Callback when the game engine signals game over
-  const handleEngineGameOver = useCallback((engineFinalScore: number) => {
+  const handleEngineGameOver = useCallback(async (engineFinalScore: number) => {
     setFinalScore(engineFinalScore);
     setIsGameOverState(true);
 
@@ -92,6 +93,8 @@ const CanvasSkyJumpGame = forwardRef<SkyJumpGameRefHandle, CanvasSkyJumpGameProp
     
     if (engineFinalScore > dojoHighScore) {
       setCurrentHighScore(engineFinalScore);
+      const tx = await client.achieve.achievePlatformHighscore(account as Account, engineFinalScore);
+      console.info('tx sky jump achievePlatformHighscore', tx);
     } else {
       setCurrentHighScore(dojoHighScore);
     }
@@ -203,6 +206,9 @@ const CanvasSkyJumpGame = forwardRef<SkyJumpGameRefHandle, CanvasSkyJumpGameProp
             
             const addOrUpdateFoodAmount = await client.player.addOrUpdateFoodAmount(account, foodId, foodCollected);
             console.info('addOrUpdateFoodAmount', addOrUpdateFoodAmount);
+
+            const achievePlayerNewTotalPoints = await client.achieve.achievePlayerNewTotalPoints(account);
+            console.info('achievePlayerNewTotalPoints', achievePlayerNewTotalPoints);
           }
         );
         return true;
@@ -333,6 +339,8 @@ const CanvasSkyJumpGame = forwardRef<SkyJumpGameRefHandle, CanvasSkyJumpGameProp
         {currentScreen === 'sharing' && selectedFoodReward && (
           <div className="skyjump-modal-overlay">
             <ShareProgress
+              account={account}
+              client={client}
               isOpen={true}
               onClose={() => setCurrentScreen('gameover')}
               type="minigame"
diff --git a/client/src/components/SpawnBeast/index.tsx b/client/src/components/SpawnBeast/index.tsx
index c97e9541..64188a9d 100644
--- a/client/src/components/SpawnBeast/index.tsx
+++ b/client/src/components/SpawnBeast/index.tsx
@@ -91,11 +91,9 @@ const SpawnBeast: React.FC<SpawnBeastProps> = ({ className = '' }) => {
           // Recargar la lista de beasts usando GraphQL
           const beastsData = await fetchBeastsData();
           const processedBeasts = await processBeastData(beastsData);
-          console.info('processedBeasts', processedBeasts);
-          
+
           // Encontrar la bestia recién creada
           newBeast = processedBeasts.find((beast: Beast) => beast.player === account!.address);
-          console.info('newBeast', newBeast);
           await new Promise(resolve => setTimeout(resolve, 2000));
         } while (!newBeast);
         
diff --git a/client/src/components/Tamagotchi/Actions/index.tsx b/client/src/components/Tamagotchi/Actions/index.tsx
index 7b94554b..f45fa34d 100644
--- a/client/src/components/Tamagotchi/Actions/index.tsx
+++ b/client/src/components/Tamagotchi/Actions/index.tsx
@@ -89,8 +89,7 @@ const Actions = ({
                     if (action === 'sleep') {
                       await client.achieve.achieveBeastSleep(account as Account);
                     } else if (action === 'clean') {
-                      const txss = await client.achieve.achieveBeastClean(account as Account);
-                      console.info('txss', txss);
+                      await client.achieve.achieveBeastClean(account as Account);
                     }
                   },
                   beastsDex[beast.specie - 1][pictureKey]
diff --git a/client/src/components/Tamagotchi/Chat/index.tsx b/client/src/components/Tamagotchi/Chat/index.tsx
index 57bac745..7eaeb168 100644
--- a/client/src/components/Tamagotchi/Chat/index.tsx
+++ b/client/src/components/Tamagotchi/Chat/index.tsx
@@ -1,5 +1,6 @@
 // React and external libraries
 import { useState, useRef } from "react";
+import { Account } from "starknet";
 
 // Internal components
 import MessageComponent from "../../ui/message";
@@ -29,7 +30,7 @@ const context = `Remembre this is your context,
           `;
 
 
-const Chat = ({ beast, expanded, botMessage, setBotMessage }: { beast: any, expanded: boolean, botMessage: any, setBotMessage: any }) => {
+const Chat = ({ beast, expanded, botMessage, setBotMessage, client, account }: { beast: any, expanded: boolean, botMessage: any, setBotMessage: any, client: any, account: any }) => {
   const { isLoading, error, sendMessage } = useBeastChat({ beast, setBotMessage });
 
   const [input, setInput] = useState("");
@@ -43,6 +44,8 @@ const Chat = ({ beast, expanded, botMessage, setBotMessage }: { beast: any, expa
 
   const handleSendMessage = async () => {
     if (input.trim() === "" || isLoading) return;
+    
+    await client.achieve.achieveBeastChat(account as Account);
 
     const messageWithContext = `${context}\n\nUser: ${input}`;
     await sendMessage(messageWithContext);
diff --git a/client/src/components/Tamagotchi/Play/index.tsx b/client/src/components/Tamagotchi/Play/index.tsx
index 5efe3320..200e72cb 100644
--- a/client/src/components/Tamagotchi/Play/index.tsx
+++ b/client/src/components/Tamagotchi/Play/index.tsx
@@ -48,6 +48,10 @@ const Play: React.FC<PlayProps> = ({
     }
 
     try {
+    
+      const tx = await client.achieve.achievePlayMinigame(account);
+      console.info('tx achievePlayMinigame', tx);
+
       handleAction(
         "Play",
         async () => {
diff --git a/client/src/components/Tamagotchi/index.tsx b/client/src/components/Tamagotchi/index.tsx
index a61b727b..adfa9d2e 100644
--- a/client/src/components/Tamagotchi/index.tsx
+++ b/client/src/components/Tamagotchi/index.tsx
@@ -58,8 +58,6 @@ function Tamagotchi() {
     if (foundBeast) setCurrentBeast(foundBeast);
   }, [player, beasts]);
 
-  console.info('player', player);
-
   const getShareableStats = () => {
     if (!currentBeast || !status) return undefined;
 
@@ -141,6 +139,8 @@ function Tamagotchi() {
                 />
               ) : currentView === 'chat' ? (
                 <Chat
+                  account={account}
+                  client={client}
                   botMessage={botMessage}
                   setBotMessage={setBotMessage}
                   beast={currentBeast}
diff --git a/client/src/components/Twitter/ShareProgress.tsx b/client/src/components/Twitter/ShareProgress.tsx
index 31d6f393..f4fa7a41 100644
--- a/client/src/components/Twitter/ShareProgress.tsx
+++ b/client/src/components/Twitter/ShareProgress.tsx
@@ -20,6 +20,8 @@ interface ShareModalProps {
     name: string;
     score: number;
   };
+  account: any;
+  client: any;
 }
 
 export const ShareProgress: React.FC<ShareModalProps> = ({
@@ -28,6 +30,8 @@ export const ShareProgress: React.FC<ShareModalProps> = ({
   type,
   stats,
   minigameData,
+  account,
+  client,
 }) => {
   const [tweetMsg, setTweetMsg] = useState("");
 
@@ -35,7 +39,7 @@ export const ShareProgress: React.FC<ShareModalProps> = ({
     if (type === 'beast' && stats) {
       setTweetMsg(
         `🎮 Playing ByteBeasts Tamagotchi, and here is my Beast's progress:\n\n` +
-        `🕰️ Age: ${stats.age}` + ` ${stats.age == 1 ? 'day' : 'days' }\n` +
+        `🕰️ Age: ${stats.age}` + ` ${stats.age == 1 ? 'day' : 'days'}\n` +
         `⚡ Energy: ${stats.energy} \n` +
         `🍖 Hunger: ${stats.hunger} \n` +
         `😊 Happiness: ${stats.happiness} \n` +
@@ -72,15 +76,15 @@ export const ShareProgress: React.FC<ShareModalProps> = ({
       <div className="modal-content">
         <div className="modal-header">
           <h2>Share on X</h2>
-          <button 
-            className="close-button" 
+          <button
+            className="close-button"
             onClick={(e) => {
               e.stopPropagation();
               onClose();
             }}
           >×</button>
         </div>
-        
+
         <div className="modal-body">
           <textarea
             value={tweetMsg}
@@ -89,19 +93,28 @@ export const ShareProgress: React.FC<ShareModalProps> = ({
             className="tweet-textarea p"
           />
         </div>
-        
+
         <div className="modal-footer">
           <a
             href={tweetText}
             target="_blank"
             rel="noreferrer"
             className="share-button"
-            onClick={(e) => e.stopPropagation()}
+            onClick={async (e) => {
+              e.stopPropagation();
+              if (minigameData) {
+                const tx = await client.achieve.achieveScoreShare(account, minigameData.score);
+                console.info('achieveScoreShare ', tx)
+              } else {
+                const tx = await client.achieve.achieveBeastShare(account);
+                console.info('achieveBeastShare ', tx)
+              }
+            }}
           >
-            Share
-          </a>
-        </div>
+          Share
+        </a>
       </div>
     </div>
+    </div >
   );
-};
\ No newline at end of file
+};
diff --git a/client/src/config/cartridgeConnector.tsx b/client/src/config/cartridgeConnector.tsx
index b62b2945..c7689408 100644
--- a/client/src/config/cartridgeConnector.tsx
+++ b/client/src/config/cartridgeConnector.tsx
@@ -107,8 +107,12 @@ const policies: SessionPolicies = {
           entrypoint: "achieve_player_new_total_points"
         },
         {
-          name: "achieve_social_share",
-          entrypoint: "achieve_social_share"
+          name: "achieve_score_share",
+          entrypoint: "achieve_score_share"
+        },
+        {
+          name: "achieve_beast_share",
+          entrypoint: "achieve_beast_share"
         },
       ],
     },
diff --git a/client/src/dojo/contracts.gen.ts b/client/src/dojo/contracts.gen.ts
index 5f1376a6..b4a0b24a 100644
--- a/client/src/dojo/contracts.gen.ts
+++ b/client/src/dojo/contracts.gen.ts
@@ -192,19 +192,40 @@ export function setupWorld(provider: DojoProvider) {
 		}
 	};
 
-	const build_achieve_achieveSocialShare_calldata = (score: number): DojoCall => {
+	const build_achieve_achieveScoreShare_calldata = (score: number): DojoCall => {
 		return {
 			contractName: "achieve",
-			entrypoint: "achieve_social_share",
+			entrypoint: "achieve_score_share",
 			calldata: [score],
 		};
 	};
 
-	const achieve_achieveSocialShare = async (snAccount: Account | AccountInterface, score: number) => {
+	const achieve_achieveScoreShare = async (snAccount: Account | AccountInterface, score: number) => {
 		try {
 			return await provider.execute(
 				snAccount as any,
-				build_achieve_achieveSocialShare_calldata(score),
+				build_achieve_achieveScoreShare_calldata(score),
+				"tamagotchi",
+			);
+		} catch (error) {
+			console.error(error);
+			throw error;
+		}
+	};
+
+	const build_achieve_achieveBeastShare_calldata = (): DojoCall => {
+		return {
+			contractName: "achieve",
+			entrypoint: "achieve_beast_share",
+			calldata: [],
+		};
+	};
+
+	const achieve_achieveBeastShare = async (snAccount: Account | AccountInterface) => {
+		try {
+			return await provider.execute(
+				snAccount as any,
+				build_achieve_achieveBeastShare_calldata(),
 				"tamagotchi",
 			);
 		} catch (error) {
@@ -655,8 +676,10 @@ export function setupWorld(provider: DojoProvider) {
 			buildAchievePlayMinigameCalldata: build_achieve_achievePlayMinigame_calldata,
 			achievePlayerNewTotalPoints: achieve_achievePlayerNewTotalPoints,
 			buildAchievePlayerNewTotalPointsCalldata: build_achieve_achievePlayerNewTotalPoints_calldata,
-			achieveSocialShare: achieve_achieveSocialShare,
-			buildAchieveSocialShareCalldata: build_achieve_achieveSocialShare_calldata,
+			achieveBeastShare: achieve_achieveBeastShare,
+			buildAchieveBeastShareCalldata: build_achieve_achieveBeastShare_calldata,
+			achieveScoreShare: achieve_achieveScoreShare,
+			buildAchieveScoreShareCalldata: build_achieve_achieveScoreShare_calldata,
 		},
 		player: {
 			addOrUpdateFoodAmount: player_addOrUpdateFoodAmount,
diff --git a/client/src/dojo/manifest_dev.json b/client/src/dojo/manifest_dev.json
index 69fe09a7..966459e8 100644
--- a/client/src/dojo/manifest_dev.json
+++ b/client/src/dojo/manifest_dev.json
@@ -1313,7 +1313,7 @@
   "contracts": [
     {
       "address": "0x1005116a48c9a8f7a6c946091e64dc8ced37962dc2bbb74355868229307c20d",
-      "class_hash": "0x5a4c23fa69d235e89b7607a1b8ba8aadae993cd7cd9adaa8e94310f3c7b100f",
+      "class_hash": "0x5a0717d24dae3e31ca2e15fd1f06cf26d9de52b84e56500d1179e38647c056e",
       "abi": [
         {
           "type": "impl",
@@ -1449,7 +1449,14 @@
             },
             {
               "type": "function",
-              "name": "achieve_social_share",
+              "name": "achieve_beast_share",
+              "inputs": [],
+              "outputs": [],
+              "state_mutability": "external"
+            },
+            {
+              "type": "function",
+              "name": "achieve_score_share",
               "inputs": [
                 {
                   "name": "score",
@@ -1600,7 +1607,8 @@
         "achieve_beast_pet",
         "achieve_beast_sleep",
         "achieve_beast_clean",
-        "achieve_social_share",
+        "achieve_beast_share",
+        "achieve_score_share",
         "achieve_beast_chat",
         "upgrade"
       ]
diff --git a/client/src/hooks/useTamagotchi.ts b/client/src/hooks/useTamagotchi.ts
index 2833c2ce..962b6ad1 100644
--- a/client/src/hooks/useTamagotchi.ts
+++ b/client/src/hooks/useTamagotchi.ts
@@ -74,7 +74,6 @@ export const useTamagotchi = (currentBeast: any) => {
       
       const tx = await actionFn();
       if (tx) {
-        await tx.wait();
         // Update status after transaction is confirmed
         const newStatus = await fetchStatus(account);
         if (newStatus && Object.keys(newStatus).length !== 0) {
@@ -248,8 +247,6 @@ export const useTamagotchi = (currentBeast: any) => {
 
     const updateStatus = async () => {
       try {
-        console.info('currentBeast', currentBeast)
-        console.info('account', account)
         if (!currentBeast || !currentBeast.beast_id || !account) {
           setIsLoading(true);
           return;
@@ -266,8 +263,6 @@ export const useTamagotchi = (currentBeast: any) => {
           fetchAge(account)
         ]);
         
-        console.info('Status response:', statusResponse);
-        
         if (!isMounted) return;
 
         if (statusResponse && Object.keys(statusResponse).length !== 0) {
@@ -276,8 +271,7 @@ export const useTamagotchi = (currentBeast: any) => {
             setStatus(newStatus);
             setIsLoading(false);
           } else {
-            const setCurrentTx = await client.player.setCurrentBeast(account!, currentBeast.beast_id);
-            console.info('setCurrentTx', setCurrentTx);
+            await client.player.setCurrentBeast(account!, currentBeast.beast_id);
             console.log('Status received for different beast:', newStatus[0], 'current beast:', currentBeast.beast_id);
             setIsLoading(true);
           }