diff --git a/client/package.json b/client/package.json
index 0d9d9643..7e4692d2 100644
--- a/client/package.json
+++ b/client/package.json
@@ -15,7 +15,6 @@
     "classnames": "^2.3.1",
     "ethers": "^5.5.4",
     "fuels": "^0.0.0-master-0bbed84",
-    "prettier": "^2.5.1",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "react-icons": "^4.3.1",
@@ -35,7 +34,7 @@
     "postbuild": "yarn create404",
     "create404": "cp ./build/index.html ./build/404.html",
     "test": "react-scripts test",
-    "eject": "react-scripts eject"
+    "prettier-format": "prettier --write src"
   },
   "eslintConfig": {
     "extends": [
@@ -63,6 +62,7 @@
     "prettier-plugin-tailwindcss": "^0.1.8",
     "tailwindcss": "^3.0.23",
     "typechain": "^8.0.0",
-    "typechain-target-fuels": "^0.0.0-master-f320686"
+    "typechain-target-fuels": "^0.0.0-master-f320686",
+    "prettier": "^2.6.2"
   }
 }
diff --git a/client/scripts/build-contracts.sh b/client/scripts/build-contracts.sh
index bd0e9dc4..faf4d420 100755
--- a/client/scripts/build-contracts.sh
+++ b/client/scripts/build-contracts.sh
@@ -13,3 +13,5 @@ echo "Build Token contract"
 forc build -p $TOKEN_CONTRACT
 echo "Build Types for contract"
 npx typechain --target fuels --out-dir=./src/types/contracts '../contracts/**/out/debug/**.json'
+echo "Prettify codes"
+npm run prettier-format
\ No newline at end of file
diff --git a/client/yarn.lock b/client/yarn.lock
index d96a695f..ac80fa28 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -7523,11 +7523,16 @@ prettier-plugin-tailwindcss@^0.1.8:
   resolved "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.1.8.tgz"
   integrity sha512-hwarSBCswAXa+kqYtaAkFr3Vop9o04WOyZs0qo3NyvW8L7f1rif61wRyq0+ArmVThOuRBcJF5hjGXYk86cwemg==
 
-prettier@^2.1.2, prettier@^2.3.1, prettier@^2.5.1:
+prettier@^2.1.2, prettier@^2.3.1:
   version "2.6.2"
   resolved "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz"
   integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==
 
+prettier@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032"
+  integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==
+
 pretty-bytes@^5.3.0, pretty-bytes@^5.4.1:
   version "5.6.0"
   resolved "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz"
diff --git a/contracts/swayswap_contract/Forc.lock b/contracts/swayswap_contract/Forc.lock
index f9f0adbb..d7166101 100644
--- a/contracts/swayswap_contract/Forc.lock
+++ b/contracts/swayswap_contract/Forc.lock
@@ -4,16 +4,16 @@ dependencies = []
 
 [[package]]
 name = 'std'
-source = 'git+https://github.com/fuellabs/sway?tag=v0.10.3#e7676db6f4ebc7a3885f87514d16a703a99410d7'
+source = 'git+https://github.com/fuellabs/sway?tag=v0.11.0#95816e4e41aae1d3425ba6ff5e7266076d8400fa'
 dependencies = ['core']
 
 [[package]]
 name = 'swayswap_abi'
-dependencies = ['std git+https://github.com/fuellabs/sway?tag=v0.10.3#e7676db6f4ebc7a3885f87514d16a703a99410d7']
+dependencies = ['std git+https://github.com/fuellabs/sway?tag=v0.11.0#95816e4e41aae1d3425ba6ff5e7266076d8400fa']
 
 [[package]]
 name = 'swayswap_contract'
 dependencies = [
-    'std git+https://github.com/fuellabs/sway?tag=v0.10.3#e7676db6f4ebc7a3885f87514d16a703a99410d7',
+    'std git+https://github.com/fuellabs/sway?tag=v0.11.0#95816e4e41aae1d3425ba6ff5e7266076d8400fa',
     'swayswap_abi',
 ]
diff --git a/contracts/token_contract/Forc.lock b/contracts/token_contract/Forc.lock
index 41441c3b..28a38bdc 100644
--- a/contracts/token_contract/Forc.lock
+++ b/contracts/token_contract/Forc.lock
@@ -4,16 +4,16 @@ dependencies = []
 
 [[package]]
 name = 'std'
-source = 'git+https://github.com/fuellabs/sway?tag=v0.10.3#e7676db6f4ebc7a3885f87514d16a703a99410d7'
+source = 'git+https://github.com/fuellabs/sway?tag=v0.11.0#95816e4e41aae1d3425ba6ff5e7266076d8400fa'
 dependencies = ['core']
 
 [[package]]
 name = 'token_abi'
-dependencies = ['std git+https://github.com/fuellabs/sway?tag=v0.10.3#e7676db6f4ebc7a3885f87514d16a703a99410d7']
+dependencies = ['std git+https://github.com/fuellabs/sway?tag=v0.11.0#95816e4e41aae1d3425ba6ff5e7266076d8400fa']
 
 [[package]]
 name = 'token_contract'
 dependencies = [
-    'std git+https://github.com/fuellabs/sway?tag=v0.10.3#e7676db6f4ebc7a3885f87514d16a703a99410d7',
+    'std git+https://github.com/fuellabs/sway?tag=v0.11.0#95816e4e41aae1d3425ba6ff5e7266076d8400fa',
     'token_abi',
 ]