fix: fixed conflicts

crowdin/messages.json

@@ -156,6 +156,7 @@
   "152524253": "Trade the world’s markets with our popular user-friendly platform.",
   "154463429": "Our demo trading experience will represent real-money trading, especially with contract pricing and trading restrictions.",
   "154883335": "Exclusive access to innovative assets",
+  "155270236": "Deriv (FX) Ltd is licensed by the Labuan Financial Services Authority <0>(licence)</0>. Deriv (BVI) Ltd is licensed by the British Virgin Islands Financial Services Commission <1>(licence)</1>. Deriv (V) Ltd is licensed by the Vanuatu Financial Services Commission <2>(licence)</2>. Deriv (SVG) LLC has a registered office at First Floor, SVG Teachers Credit Union Uptown Building, Corner of James and Middle Street, Kingstown P.O., St Vincent and the Grenadines. Deriv.com Limited is the holding company for the above subsidiaries with the registration number 71479 and the registered address is located at 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ.",
   "155518428": "graph",
   "155869362": "high low",
   "156487821": "DEX 1500 DOWN Index",
@@ -376,6 +377,7 @@
   "375485199": "24/7 customer support via live chat on our website",
   "376073087": "<0>Deriv MT5 (DMT5)</0> and <1>Deriv X</1> are both multi-asset trading platforms where you can trade CFDs with leverage on multiple asset classes. The major difference between them is the platform layout — MT5 has a simple all-in-one view, while on Deriv X you can customise the layout according to your preference.",
   "376358538": "- Select your preferred trading asset.",
+  "376773528": "Deriv Life",
   "378043056": "Each of these indices replicates the performance of top publicly traded companies in a financial market in the Asia/ Oceania region.",
   "379401010": "Partners",
   "381970124": "If you select 'Odd', you receive the payout if the last digit of the exit price is an odd number (e.g. 1, 3, 5, 7, 9).",
@@ -425,6 +427,7 @@
   "421158556": "You may refer to <0>our terms</0> for more information. If you need help getting into your account, <1>contact us via live chat.</1>",
   "421232681": "Additional terms",
   "421563171": "What are vanilla options?",
+  "422844635": "Please read our <0>Terms and conditions</0>, <1>Risk disclosure</1>, and <2>Secure and responsible trading</2> to fully understand the risks involved before using our services. The information on this website does not constitute investment advice.",
   "426355147": "<0> {{loss_percent}}% of retail investor accounts lose money when trading CFDs with Deriv, read our full Risk disclosure here.</0>",
   "426923558": "The closer the barrier is to the spot price, the higher the chance for your turbo options contract to expire worthless (which means, your contract will expire without any payout or profit).",
   "427008206": "Be transparent",
@@ -572,6 +575,7 @@
   "550365780": "Open a demo account and practise with an unlimited amount of virtual funds.",
   "550921370": "No matter if you are large, small, or have just started, Deriv Prime will provide top-of-book liquidity solutions with very fast execution at unmatched fair pricing and conditions.",
   "551739457": "3. Under <strong>CFDs</strong>, look for <strong>Deriv cTrader</strong> and hit <strong>Trade</strong>.",
+  "551958626": "Excellent",
   "552929836": "How does the Reset Call/Reset Put contract type differ from the Rise/Fall contract type?",
   "554014185": "Online trading is exciting, but it can be addictive. Deriv.com provides you with the opportunity to either self-exclude or set limits on your trading activities on this website.",
   "554620691": "Please enter a valid number",
@@ -617,6 +621,7 @@
   "590858519": "Say goodbye to overnight charges, keep your positions open for as long as you want.*",
   "591295543": "Dynamic tiers ⁠— Stock indices",
   "591710014": "Why trade baskets on Deriv",
+  "592964176": "Join over 2.5 million traders",
   "595022058": "100",
   "595278941": "Asset price",
   "595722471": "Return to player (RTP) % for lookbacks for a multiplier of 1 and 1m duration is around 87% on average.",
@@ -1383,6 +1388,7 @@
   "1344216985": "We can’t deliver the email to this address (usually because of firewalls or filtering).",
   "1345965490": "- lower than the entry price for a Reset Call contract, or",
   "1346204508": "Take profit",
+  "1347763171": "Indices simulating real-world markets with 24/7 trading",
   "1349080073": "Please enter only alphabetic characters",
   "1351421019": "Where can I trade Asian options?",
   "1353732907": "Refers to the currency pair or other product that can be traded.",
@@ -2101,6 +2107,7 @@
   "1979304570": "Deriv Investments (Europe) Limited is licensed and regulated by the Malta Financial Services Authority under the Investment Services Act (<0>licence</0>). Deriv (FX) Ltd is licensed by the Labuan Financial Services Authority (<1>licence</1>). Deriv (BVI) Ltd is licensed by the British Virgin Islands Financial Services Commission (<2>licence</2>). Deriv (V) Ltd is licensed by the Vanuatu Financial Services Commission (<3>licence</3>). Deriv (SVG) LLC has a registered office at First Floor, SVG Teachers Credit Union Uptown Building, Corner of James and Middle Street, Kingstown P.O., St Vincent and the Grenadines. Deriv.com Limited is the holding company for the above subsidiaries with the registration number 71479 and the registered address is located at 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ.",
   "1979503547": "Trading terms",
   "1980724783": "The point value is derived from the current digits of the asset. In this example, the digit is 5, so the point value is 0.00001.",
+  "1981714597": "The world’s most popular digital currencies.",
   "1982055410": "See all derived indices pairs",
   "1982404952": "Get quote",
   "1983480826": "Sign in",
@@ -2128,6 +2135,7 @@
   "1998452473": "Earn up to 45% lifetime commission with an online trading provider that enables anyone to trade on several popular financial markets with the utmost convenience. Deriv Group Ltd — the owner of Deriv.com — has a proven track record of running successful referral programmes with prompt payouts.",
   "1999120464": "Forex (Minor)",
   "1999511199": "Users worldwide",
+  "2000568638": "World markets including precious metals and energies.",
   "2000965959": "Trading hours",
   "2002128854": "<p>No, early exits are not available for Reset Call/Reset Put contracts.</p><p>Please note that the availability of early exit from your trading position depends on the specific trade type, or it may only be available within a certain timeframe.</p>",
   "2003802343": "There is absolutely no requirement to withdraw your IB commissions.",
@@ -3159,6 +3167,7 @@
   "-238387918": "Trade forex, stocks & indices, cryptocurrencies, commodities, and derived indices in one place.",
   "-707160742": "Easy start",
   "-897434771": "Already have a Deriv account? Use those credentials to sign in to Deriv cTrader.",
+  "-223886724": "Our principles",
   "-1898146227": "get it on google play",
   "-573436898": "Trading for anyone. Anywhere. Anytime.",
   "-1124845179": "Open demo account",
@@ -3169,19 +3178,30 @@
   "-1384760133": "Bid price",
   "-1882694284": "Ask price",
   "-1293060532": "Daily % change",
+  "-167548267": "Trade with leverage, unbeatable spreads, and fast execution on the widest range  of markets.",
+  "-1416031190": "Trade diverse vanilla and exotic options across platforms and markets without risking more than your initial stake.",
+  "-591857861": "The most popular and comprehensive CFDs platform.",
+  "-2055020841": "User-friendly and customisable CFDs platform.",
+  "-1123792363": "Options trading platform with easy navigation.",
+  "-1098228973": "Major, minor, and exotic  currency pairs.",
+  "-1120049888": "Leading company stocks and top global indices.",
+  "-1960027144": "Diverse exchange-traded funds for broad market exposure.",
+  "-1939560439": "Traders' tools",
   "-908888368": "Sign up & explore",
-  "-1307824678": "2.Try with zero-risk",
   "-626244619": "Try any trade, on any platform with a zero-risk, demo trading account.",
-  "-1412295366": "3.Trade with confidence",
+  "-230284900": "3. Trade with confidence",
   "-1373001377": "Trade with confidence",
+  "-1307824678": "2.Try with zero-risk",
+  "-1412295366": "3.Trade with confidence",
+  "-1936142548": "Fund your account and start trading with round-the-clock support.",
   "-354246493": "Start trading in 3 simple steps",
   "-1896639903": "$650B+",
   "-1921087985": "Monthly volume",
   "-1330380888": "Established since",
   "-1692319801": "Trade with leverage, unbeatable spreads, and fast execution on the widest range of markets.",
-  "-1416031190": "Trade diverse vanilla and exotic options across platforms and markets without risking more than your initial stake.",
+  "-179708159": "Trade CFDs & Multipliers",
   "-1160523575": "Trade CFDs, Options, or Multipliers",
-  "-591857861": "The most popular and comprehensive CFDs platform.",
+  "-1924134753": "TrustScore {{trustScore}} out of 5 based on {{numberOfReviews}} reviews",
   "-374485603": "Regulated",
   "-1615451408": "Our professional multilingual team is here for you anytime.",
   "-1863708031": "Exchange-traded funds (ETFs) allow you to diversify your portfolio with assets that track bonds, commodities, and indices, without the high cost of owning the underlying assets.",
@@ -3235,8 +3255,6 @@
   "-187586473": "Trade forex",
   "-828546225": "Trade cryptocurrencies",
   "-904662996": "Trade commodities",
-  "-1120049888": "Leading company stocks and top global indices.",
-  "-1960027144": "Diverse exchange-traded funds for broad market exposure.",
   "-550487473": "Trade ETFs",
   "-1580384961": "Deriv Prime is the institutional arm of Deriv Group, and staying true to its guiding principles, effectively democratises liquidity provision to financial institutions.",
   "-1895596299": "- Investment funds",
@@ -3525,11 +3543,7 @@
   "-984581646": "Trade the price of precious metals and oil.",
   "-1107962717": "Ride the crypto waves.",
   "-1850916180": "See all cryptocurrencie",
-  "-2055020841": "User-friendly and customisable CFDs platform.",
   "-2043758047": "Sign up in minutes and explore Trader’s Hub - all your trading needs, in one place.  ",
-  "-230284900": "3. Trade with confidence",
-  "-1936142548": "Fund your account and start trading with round-the-clock support.",
-  "-179708159": "Trade CFDs & Multipliers",
   "-1382581758": "My experience so far is just awesome! You can do instant buying and selling, and I hope to continue enjoying using Deriv P2P. Keep up the good work!",
   "-459332544": "I have never seen a platform that is so flexible with multiple resources that meet everyone’s needs. If that’s not enough, Deriv is second to none on customer support services!",
   "-2033498676": "Deriv has multiple withdrawal methods, including Deriv P2P, which is fast and convenient. Their support team is available any time and responds very quickly to any queries.",
@@ -3887,7 +3901,6 @@
   "-1356010780": "Implement policies to prevent vulnerable persons from trading",
   "-1186213423": "We will refuse underage persons’ access and implement processes to identify customers who are trading beyond their financial capacity.",
   "-220003669": "We will implement know-your-customer (KYC) controls and prevent money laundering and other unlawful activities on our platforms.",
-  "-223886724": "Our principles",
   "-586716383": "Our principles | Deriv",
   "-141169956": "Deriv P2P – peer-to-peer deposit and withdrawal service",
   "-1451760391": "With Deriv P2P your deposits and withdrawals are easy, fast, and efficient. Access now via the desktop or mobile app.",
@@ -4417,7 +4430,6 @@
   "-470690579": "Stop loss and take profit for multipliers",
   "-1217327947": "Try multipliers calculator",
   "-1382112538": "PnL multipliers",
-  "-1939560439": "Traders' tools",
   "-626406870": "right arrow",
   "-66889773": "Our margin calculator helps you to estimate the margin required to keep your positions open overnight on Deriv MT5.",
   "-1788261316": "Margin required",

package.json

@@ -86,6 +86,7 @@
         "@graphql-codegen/cli": "^2.16.5",
         "@graphql-codegen/typescript": "^2.8.8",
         "@graphql-codegen/typescript-operations": "^2.5.13",
+        "@lmdb/lmdb-darwin-arm64": "^2.8.5",
         "@loadable/babel-plugin": "^5.16.1",
         "@parcel/watcher": "^2.3.0",
         "@storybook/addon-actions": "^6.4.9",