Merge branch 'next' into feat/oeth-withdrawal

OriginProtocol · Jul 30, 2024 · 5c5f83b · 5c5f83b
2 parents 3ac2f06 + 4c420f9
commit 5c5f83b
Show file tree

Hide file tree

Showing 107 changed files with 1,606 additions and 7,694 deletions.
diff --git a/apps/defi/src/lang/en.json b/apps/defi/src/lang/en.json
@@ -247,12 +247,6 @@
       "value": "Return to Home Page"
     }
   ],
-  "2/2yg+": [
-    {
-      "type": 0,
-      "value": "Add"
-    }
-  ],
   "20KPDF": [
     {
       "type": 0,
@@ -871,12 +865,6 @@
       "value": "Bridging activity"
     }
   ],
-  "BLAy25": [
-    {
-      "type": 0,
-      "value": "Extend"
-    }
-  ],
   "BNFT1w": [
     {
       "type": 0,
@@ -1083,6 +1071,12 @@
       "value": "0 months"
     }
   ],
+  "FIG7wh": [
+    {
+      "type": 0,
+      "value": "Any unclaimed rewards will transferred to your wallet immediately when you extend your stake."
+    }
+  ],
   "FVYhKc": [
     {
       "type": 0,
@@ -1359,12 +1353,6 @@
       "value": "symbol"
     }
   ],
-  "Kzhxqf": [
-    {
-      "type": 0,
-      "value": "Select the additional OGN you would like to add to your lockup"
-    }
-  ],
   "L2dDDV": [
     {
       "type": 0,
@@ -2145,12 +2133,6 @@
       "value": "Learn about governance"
     }
   ],
-  "YnTVWE": [
-    {
-      "type": 0,
-      "value": "Adding to lockup"
-    }
-  ],
   "YnftYz": [
     {
       "type": 0,
@@ -2657,6 +2639,12 @@
       "value": "Gas"
     }
   ],
+  "hsG1EM": [
+    {
+      "type": 0,
+      "value": "Extend/Add"
+    }
+  ],
   "hsqHqR": [
     {
       "type": 0,
@@ -2687,20 +2675,6 @@
       "value": "Error while estimating"
     }
   ],
-  "iRGhsn": [
-    {
-      "type": 0,
-      "value": "Add unclaimed rewards ("
-    },
-    {
-      "type": 1,
-      "value": "rewards"
-    },
-    {
-      "type": 0,
-      "value": " OGN)"
-    }
-  ],
   "iaS0YY": [
     {
       "type": 0,
@@ -2779,12 +2753,6 @@
       "value": "Your voting power"
     }
   ],
-  "kDaImL": [
-    {
-      "type": 0,
-      "value": "Add to lockup"
-    }
-  ],
   "kH1R79": [
     {
       "type": 0,
@@ -2891,6 +2859,12 @@
       "value": "."
     }
   ],
+  "mDjDir": [
+    {
+      "type": 0,
+      "value": "Manage Stake"
+    }
+  ],
   "mTz9QI": [
     {
       "type": 0,
@@ -3403,12 +3377,6 @@
       "value": "Bridge your ETH in a single transaction and use wOETH across Arbitrum to earn ARB tokens."
     }
   ],
-  "xiGfmr": [
-    {
-      "type": 0,
-      "value": "Extend stake"
-    }
-  ],
   "xkKA0U": [
     {
       "type": 0,
@@ -3605,4 +3573,4 @@
       "value": "Waiting for signature"
     }
   ]
-}
+}
diff --git a/apps/defi/src/lang/extracts/en.json b/apps/defi/src/lang/extracts/en.json
@@ -107,9 +107,6 @@
   "1nxJrQ": {
     "defaultMessage": "Return to Home Page"
   },
-  "2/2yg+": {
-    "defaultMessage": "Add"
-  },
   "20KPDF": {
     "defaultMessage": "Registered Voters"
   },
@@ -350,9 +347,6 @@
   "BB94QK": {
     "defaultMessage": "Bridging activity"
   },
-  "BLAy25": {
-    "defaultMessage": "Extend"
-  },
   "BNFT1w": {
     "defaultMessage": "Global stats"
   },
@@ -440,6 +434,9 @@
   "F6lS59": {
     "defaultMessage": "0 months"
   },
+  "FIG7wh": {
+    "defaultMessage": "Any unclaimed rewards will transferred to your wallet immediately when you extend your stake."
+  },
   "FVYhKc": {
     "defaultMessage": "Balances"
   },
@@ -560,9 +557,6 @@
   "Kw1jw2": {
     "defaultMessage": "Get {symbol}"
   },
-  "Kzhxqf": {
-    "defaultMessage": "Select the additional OGN you would like to add to your lockup"
-  },
   "L2dDDV": {
     "defaultMessage": "The percentage of total Origin DeFi DAO voting power represented by this lockup."
   },
@@ -845,9 +839,6 @@
   "Yl2sc/": {
     "defaultMessage": "Learn about governance"
   },
-  "YnTVWE": {
-    "defaultMessage": "Adding to lockup"
-  },
   "YnftYz": {
     "defaultMessage": "Wait time:"
   },
@@ -1046,6 +1037,9 @@
   "hjWYtP": {
     "defaultMessage": "Gas"
   },
+  "hsG1EM": {
+    "defaultMessage": "Extend/Add"
+  },
   "hsqHqR": {
     "defaultMessage": "Time remaining"
   },
@@ -1061,9 +1055,6 @@
   "iLgjES": {
     "defaultMessage": "Error while estimating"
   },
-  "iRGhsn": {
-    "defaultMessage": "Add unclaimed rewards ({rewards} OGN)"
-  },
   "iaS0YY": {
     "defaultMessage": "I have read and agree to the above terms"
   },
@@ -1103,9 +1094,6 @@
   "kBjaSb": {
     "defaultMessage": "Your voting power"
   },
-  "kDaImL": {
-    "defaultMessage": "Add to lockup"
-  },
   "kH1R79": {
     "defaultMessage": "Stake OGN"
   },
@@ -1145,6 +1133,9 @@
   "m9XypM": {
     "defaultMessage": "Sending {amount} {symbolIn} to {chainOut}."
   },
+  "mDjDir": {
+    "defaultMessage": "Manage Stake"
+  },
   "mTz9QI": {
     "defaultMessage": "Casted vote"
   },
@@ -1367,9 +1358,6 @@
   "xc6pWX": {
     "defaultMessage": "Bridge your ETH in a single transaction and use wOETH across Arbitrum to earn ARB tokens."
   },
-  "xiGfmr": {
-    "defaultMessage": "Extend stake"
-  },
   "xkKA0U": {
     "defaultMessage": "Delegate on-chain voting power to:"
   },

diff --git a/apps/oeth/src/lang/en.json b/apps/oeth/src/lang/en.json
@@ -139,12 +139,6 @@
       "value": " slippage:"
     }
   ],
-  "4D9M13": [
-    {
-      "type": 0,
-      "value": "Swap with CurvePool"
-    }
-  ],
   "4LOwM/": [
     {
       "type": 0,
@@ -367,12 +361,6 @@
       "value": "Theme:"
     }
   ],
-  "C73Nbd": [
-    {
-      "type": 0,
-      "value": "Swap with Curve"
-    }
-  ],
   "CcqmCh": [
     {
       "type": 0,
@@ -869,6 +857,12 @@
       "value": "Est. bridge fee"
     }
   ],
+  "eerX6M": [
+    {
+      "type": 0,
+      "value": "Swap via CurvePool"
+    }
+  ],
   "fBhctx": [
     {
       "type": 0,

diff --git a/apps/oeth/src/lang/extracts/en.json b/apps/oeth/src/lang/extracts/en.json
@@ -59,9 +59,6 @@
   "45EvZ3": {
     "defaultMessage": "Minimum received with {slippage} slippage:"
   },
-  "4D9M13": {
-    "defaultMessage": "Swap with CurvePool"
-  },
   "4LOwM/": {
     "defaultMessage": "OETH Transactions"
   },
@@ -149,9 +146,6 @@
   "BuhEl+": {
     "defaultMessage": "Theme:"
   },
-  "C73Nbd": {
-    "defaultMessage": "Swap with Curve"
-  },
   "CcqmCh": {
     "defaultMessage": "OETH Balance"
   },
@@ -365,6 +359,9 @@
   "eJNRiB": {
     "defaultMessage": "Est. bridge fee"
   },
+  "eerX6M": {
+    "defaultMessage": "Swap via CurvePool"
+  },
   "fBhctx": {
     "defaultMessage": "Download CSV"
   },