fix translation issues; fix pubkey viewing

components/AccountInfo.tsx

@@ -3,6 +3,7 @@ import {
   nativeI80F48ToUi,
   nativeToUi,
   QUOTE_INDEX,
+  sleep,
   ZERO_BN,
   ZERO_I80F48,
 } from '@blockworks-foundation/mango-client'
@@ -76,7 +77,6 @@ export default function AccountInfo() {
         mngoNodeBank.publicKey,
         mngoNodeBank.vault
       )
-      actions.reloadMangoAccount()
       notify({
         title: t('redeem-success'),
         description: '',
@@ -89,6 +89,9 @@ export default function AccountInfo() {
         txid: e.txid,
         type: 'error',
       })
+    } finally {
+      await sleep(500)
+      actions.reloadMangoAccount()
     }
   }
 

components/TradeHistoryTable.tsx

@@ -356,16 +356,24 @@ const TradeHistoryTable = ({ numTrades }: { numTrades?: number }) => {
               ) : null}
             </div>
           )}
-          <div className="flex items-center justify-end">
-            <Pagination
-              page={page}
-              totalPages={totalPages}
-              nextPage={nextPage}
-              lastPage={lastPage}
-              firstPage={firstPage}
-              previousPage={previousPage}
-            />
-          </div>
+          {numTrades && items.length > numTrades ? (
+            <div className="flex items-center justify-center mt-4">
+              <Link href="/account" shallow={true}>
+                {t('view-all-trades')}
+              </Link>
+            </div>
+          ) : (
+            <div className="flex items-center justify-end">
+              <Pagination
+                page={page}
+                totalPages={totalPages}
+                nextPage={nextPage}
+                lastPage={lastPage}
+                firstPage={firstPage}
+                previousPage={previousPage}
+              />
+            </div>
+          )}
         </div>
       </div>
     </div>

pages/account.tsx

@@ -30,7 +30,7 @@ import Select from '../components/Select'
 import { useRouter } from 'next/router'
 import { PublicKey } from '@solana/web3.js'
 
-export async function getStaticProps({ locale }) {
+export async function getServerSideProps({ locale }) {
   return {
     props: {
       ...(await serverSideTranslations(locale, ['common'])),
@@ -102,7 +102,9 @@ export default function Account() {
       }
     }
 
-    loadUnownedMangoAccount()
+    if (pubkey) {
+      loadUnownedMangoAccount()
+    }
   }, [pubkey, mangoGroup])
 
   useEffect(() => {

public/locales/en/common.json

@@ -206,7 +206,7 @@
   "recent": "Recent",
   "recent-trades": "Recent Trades",
   "redeem-failure": "Error redeeming MNGO",
-  "redeem-sucess": "Successfully redeemed MNGO",
+  "redeem-success": "Successfully redeemed MNGO",
   "refresh": "Refresh",
   "refresh-data": "Refresh Data",
   "repay": "Repay",
@@ -241,7 +241,7 @@
   "stop-limit": "Stop Limit",
   "stop-loss": "Stop Loss",
   "stop-price": "Stop Price",
-  "successfully-placed": "Successfully placed trade",
+  "successfully-placed": "Successfully placed order",
   "supported-assets": "Please fund wallet with one of the supported assets.",
   "take-profit": "Take Profit",
   "take-profit-limit": "Take Profit Limit",

public/locales/es/common.json

@@ -204,7 +204,7 @@
   "recent": "Reciente",
   "recent-trades": "Operaciones recientes",
   "redeem-failure": "Error al canjear MNGO",
-  "redeem-sucess": "MNGO canjeado con éxito",
+  "redeem-success": "MNGO canjeado con éxito",
   "refresh": "Actualizar",
   "refresh-data": "Actualizar datos",
   "repay": "Repay",

public/locales/zh/common.json

@@ -205,7 +205,7 @@
     "recent": "最近",
     "recent-trades": "最近成交",
     "redeem-failure": "收获MNGO奖励出错了",
-    "redeem-sucess": "已收获MNGO奖励了",
+    "redeem-success": "已收获MNGO奖励了",
     "refresh": "更新",
     "refresh-data": "更新资料",
     "repay": "归还",

public/locales/zh_tw/common.json

@@ -205,7 +205,7 @@
   "recent": "最近",
   "recent-trades": "最近成交",
   "redeem-failure": "收穫MNGO獎勵出錯了",
-  "redeem-sucess": "已收穫MNGO獎勵了",
+  "redeem-success": "已收穫MNGO獎勵了",
   "refresh": "更新",
   "refresh-data": "更新資料",
   "repay": "歸還",