Merge latest for deployment

.vscode/settings.json

@@ -1,3 +1,5 @@
 {
-  "css.customData": [".vscode/css_custom_data.json"]
+  "css.customData": [
+    ".vscode/css_custom_data.json"
+  ]
 }

package.json

@@ -13,7 +13,7 @@
     "prepare": "husky install"
   },
   "dependencies": {
-    "@airswap/libraries": "4.3.6",
+    "@airswap/libraries": "5.0.3",
     "@akkafinance/web3-react-bitkeep": "^1.0.0",
     "@coinbase/wallet-sdk": "^3.7.2",
     "@craco/craco": "^6.2.0",

public/index.html

@@ -31,7 +31,7 @@
 
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link rel="stylesheet" href="https://use.typekit.net/wyd3jpl.css" />
+    <link rel="stylesheet" href="https://use.typekit.net/eix0liv.css" />
     <script async src="https://www.googletagmanager.com/gtag/js?id=G-XSB2E7X42G"></script>
     <script>
       window.dataLayer = window.dataLayer || [];

public/locales/en/translation.json

@@ -7,7 +7,6 @@
     "addToTokenSet": "Import",
     "balance": "Balance",
     "failedToFetchAllowances": "Failed to fetch token allowances",
-    "failedToFetchAllowancesCta": "Please reload the page",
     "tokenBalances": "Token balances",
     "unsupportedToken": "Not yet supported"
   },
@@ -41,11 +40,12 @@
     "language": "Language",
     "learn": "learn",
     "light": "Light",
-    "make": "Make",
+    "make": "OTC",
     "makeOrder": "Make new order",
     "max": "Max",
     "minutes": "minutes",
     "minutesShort": "Min",
+    "myOrders": "OTC",
     "networks": "Networks",
     "no": "No",
     "noResultsFound": "No results found",
@@ -56,8 +56,9 @@
     "receive": "Receive",
     "reloadPage": "Reload Page",
     "review": "Review",
-    "rfq": "RFQ",
+    "rfq": "DEX",
     "select": "Select",
+    "selectToken": "Select token",
     "send": "Send",
     "settings": "Settings",
     "sign": "Sign",
@@ -87,43 +88,41 @@
     "counterParty.title": "Counterparty Wallets",
     "gasFreeSwaps.paragraph": "You found a gasless swap!",
     "gasFreeSwaps.paragraph2": "Some swaps do not require you to pay gas because the transaction is handled by the maker. You'll still need to sign the swap using your wallet to proceed.",
-    "gasFreeSwaps.title": "Gasless swaps",
-    "join.ambassador": "Ambassador",
-    "join.author": "Author",
-    "join.developer": "Developer",
-    "join.getStarted": "Get started",
-    "join.intro": "AirSwap is an open community of developers, designers, writers, and tinkerers building decentralized trading systems. Protocol fees are automatically distributed to contributors.",
-    "join.paragraph2": "Check out the following guides to learn more.",
-    "join.title": "Join AirSwap",
-    "join.voter": "Voter",
-    "protocolFee.paragraph": "AirSwap includes protocol fees distributed to active contributor community members. By using AirSwap you're supporting the development and stewardship of decentralized trading protocols.",
+    "gasFreeSwaps.title": "Gasless swap",
+    "protocolFee.paragraph": "A protocol fee is processed on each swap and distributed to AirSwap contributors and active participants in the decentralized governance process. Using AirSwap supports the development and stewardship of decentralized protocols.",
     "protocolFee.title": "Protocol Fee"
   },
   "marketing": {
-    "includesFee": "Includes 0.07% fee",
-    "welcomeHeading": "Secure and efficient P2P swaps",
-    "welcomeMessage": "Decentralized trading with zero slippage "
+    "welcomeMessage": "Swap tokens with zero slippage"
   },
   "orders": {
-    "actionCannotBeReversed": "This action cannot be reversed",
+    "actionCannotBeReversed": "This will cancel the order on-chain",
     "afterFee": "After {{fee}} fee",
     "amount": "Amount",
     "anyone": "Anyone",
     "approve": "Approve",
-    "approveMessage": "Approve AirSwap to transfer your tokens.",
-    "approvePending": "Prepared to approve {{symbol}}",
+    "orderAmount": "Order amount",
+    "feeAmount": "Protocol fee",
+    "currentApprovalAmount": "Current approval",
+    "requiredApprovalAmount": "Required approval",
+    "approveTokenInYourWallet": "Approve token in your wallet",
+    "approvalComplete": "Approved",
+    "approvalProcessing": "Approving swap...",
     "areYouSureYouWantToCancel": "Are you sure you want to cancel?",
     "availableOrders": "Available orders",
     "bestQuote": "Best quote",
-    "cancelOrder": "Cancel order",
-    "chooseToken": "Choose token",
+    "cancelOrder": "Cancel",
+    "chooseToken": "Select token",
     "clearCustomServer": "Clear custom server",
-    "confirmCancel": "Confirm cancel",
+    "confirmCancel": "Cancel",
+    "connectWallet": "Connect your wallet to proceed",
     "continue": "Continue",
     "copyLink": "Copy link",
     "counterPartyAddress": "Counterparty address",
+    "depositComplete": "Deposit complete",
+    "depositProcessing": "Deposit processing...",
     "dismiss": "Dismiss",
-    "editCustomTokens": "Edit Custom Tokens",
+    "editCustomTokens": "Edit",
     "enterAmount": "Enter an amount",
     "enterAmounts": "Enter amounts",
     "enterTakerAddressOrENS": "Enter taker address or ENS",
@@ -135,21 +134,25 @@
     "expandedResults": "Expanded results from inactive Token Lists",
     "expiryShouldBeMoreThan0": "Expiry should be more than 0",
     "expiryTime": "Expiry",
-    "findingBestPrice": "Finding the best prices...",
+    "findingBestPrice": "Fetching available prices...",
     "from": "From",
     "gasCost": "Gas cost",
-    "gasFreeTrade": "Gasless swap",
-    "insufficientBalance": "Insufficient {{symbol}} balance",
+    "gasFreeTrade": "Gasless",
+    "getAPrice": "Get prices from online servers",
+    "insufficientBalance": "Insufficient balance",
     "listed": "Listed",
     "listingType": "Listing type",
-    "makeNewOrder": "New order",
+    "makeAnOrder": "Make an order",
+    "makeNewOrder": "Make new order",
     "makeNewSwap": "New swap",
     "moreInformation": "More information",
     "nativeCurrencyMaxInfoText": "{{amount}}. This amount is calculated after subtracting a {{fee}} gas fee from your total balance.",
-    "newQuoteIn": "New Quote In",
+    "newQuoteIn": "New quote in",
     "noIndexerOrdersFound": "No orders found for this token pair",
     "noIndexersFound": "No indexer nodes found",
     "orderSuccessfullyCreated": "Order successfully created.",
+    "pendingWallet": "Waiting for wallet",
+    "pendingConfirmation": "Confirm to proceed",
     "price": "Price",
     "priceDifference": "Price difference",
     "protocolFee": "Fee",
@@ -166,33 +169,38 @@
     "selectedServer": "Selected {{serverUrl}} as custom server",
     "settings": "Settings",
     "specificTaker": "Specific Taker",
-    "startByCreatingANewOrder": "Start by creating a new order",
-    "submitted": "Transaction Submitted",
+    "startByCreatingANewOrder": "Start by making an order.",
     "swapExpired": "Swap expired",
     "swapExpiredCallToAction": "Please try again",
     "swapFailed": "Error submitting swap",
     "swapFailedCallToAction": "Please try again",
     "swapMessage": "Accept on your wallet to proceed",
     "swapPending": "Prepared to swap",
     "swapRejected": "Price expired",
-    "swapRejectedByUser": "Swap rejected by user",
+    "swapRejectedByUser": "Rejected by wallet",
     "swapRejectedCallToAction": "Please try again",
     "takeOtc": "Take",
-    "takeQuote": "Complete Swap",
+    "takeQuote": "Take",
     "thisOrderIsForADifferentTaker": "This order is for a different taker",
-    "thisOrderIsForAnotherChain": "This order is for the {{chainName}} chain",
+    "thisOrderIsForAnotherChain": "This order is for {{chainName}}",
     "thisOrderWasForADifferentTaker": "This order was for a different taker",
+    "takeSwap": "Take",
     "to": "To",
     "tokenInfoNotFound": "Token info not found",
     "tokenPairUnavailable": "No quotes available",
+    "noValidResponses": "No servers currently available",
     "total": "Total",
     "track": "Track",
-    "trackTransaction": "Track this transaction on the top right",
-    "transactionCompleted": "Transaction Completed",
+    "trackTransaction": "View in transaction history",
+    "transactionCompleted": "Swap complete",
+    "orderSent": "Sending order...",
+    "orderSentToMaker": "Sending order to the maker",
+    "orderSubmitted": "Order submitted...",
+    "orderSubmittedByMaker": "Maker has submitted order",
     "unableTake": "Unable to take",
     "viewAllQuotes": "View all quotes",
     "wrapMessage": "No protocol fee for ETH/WETH swaps",
-    "youHaveNoOpenOTCOrders": "You have no open OTC orders"
+    "youHaveNoOpenOTCOrders": "You have no orders."
   },
   "toast": {
     "approvalComplete": "Approval Complete",
@@ -215,6 +223,7 @@
     "nonceAlreadyUsed": "Nonce has been already used or cancelled",
     "senderAllowanceLow": "Sender (taker) has not approved the required amount",
     "senderBalanceLow": "Sender (taker) does not have the required balance",
+    "signatureInvalid": "Invalid signature",
     "signerAllowanceLow": "Signer (maker) has not approved the required amount",
     "signerBalanceLow": "Signer (maker) does not have the required balance",
     "swapFail": "The swap would fail for the following reasons.",
@@ -228,15 +237,14 @@
     "approve": "Approve {{symbol}}",
     "cleanupOptions": "Cleanup options",
     "completedTransactions": "Completed transactions",
-    "connectWallet": "Connect Wallet",
+    "connectWallet": "Continue",
     "copyAddress": "Copy address",
     "dayAgo_one": "{{count}} day ago",
     "dayAgo_other": "{{count}} days ago",
     "disconnectWallet": "Disconnect",
     "get": "Get",
     "hourAgo_one": "{{count}} hour ago",
     "hourAgo_other": "{{count}} hours ago",
-    "ifYourWalletDoesNotOpenSomethingWentWrong": "If your wallet does not open, something went wrong.",
     "justNow": "Just now",
     "lastLookTransaction": "{{signerAmount}} {{signerToken}} → {{senderAmount}} {{senderToken}}",
     "latestGithubCommit": "Latest github commit",
@@ -248,11 +256,10 @@
     "noCompletedTransactions": "No completed transactions",
     "noTransactions": "No Transactions",
     "notConnected": "Not connected",
-    "selectWallet": "Select a wallet",
-    "signInWallet": "Sign in wallet",
+    "selectWallet": "Select wallet",
     "switchNetwork": "Switch network",
     "transaction": "{{senderAmount}} {{senderToken}} → {{signerAmount}} {{signerToken}}",
-    "transactionLink": "Transaction link",
+    "transactionLink": "View on block explorer",
     "unsupported": "Unsupported",
     "unsupportedNetwork": "Unsupported network",
     "viewOnExplorer": "View on explorer",