From 40633e99d17dd0217d016e808bdae33ad82c33b2 Mon Sep 17 00:00:00 2001
From: Hrik Bhowal <hrik.bhowal@gmail.com>
Date: Thu, 25 May 2023 13:32:54 -0700
Subject: [PATCH 1/5] bugs

---
 dapp-oeth/.vscode/launch.json                 |  28 ++++
 dapp-oeth/pages/history.js                    |   2 +-
 .../src/components/TransactionHistory.js      | 147 +++++++++---------
 dapp-oeth/src/utils/math.js                   |   7 +-
 4 files changed, 110 insertions(+), 74 deletions(-)
 create mode 100644 dapp-oeth/.vscode/launch.json

diff --git a/dapp-oeth/.vscode/launch.json b/dapp-oeth/.vscode/launch.json
new file mode 100644
index 0000000000..c3dbb85155
--- /dev/null
+++ b/dapp-oeth/.vscode/launch.json
@@ -0,0 +1,28 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Next.js: debug server-side",
+      "type": "node-terminal",
+      "request": "launch",
+      "command": "yarn dev"
+    },
+    {
+      "name": "Next.js: debug client-side",
+      "type": "chrome",
+      "request": "launch",
+      "url": "http://localhost:3000"
+    },
+    {
+      "name": "Next.js: debug full stack",
+      "type": "node-terminal",
+      "request": "launch",
+      "command": "PORT=3001 yarn dev",
+      "serverReadyAction": {
+        "pattern": "started server on .+, url: (https?://.+)",
+        "uriFormat": "%s",
+        "action": "debugWithChrome"
+      }
+    }
+  ]
+}
diff --git a/dapp-oeth/pages/history.js b/dapp-oeth/pages/history.js
index 0f1df9100b..7c148194d8 100644
--- a/dapp-oeth/pages/history.js
+++ b/dapp-oeth/pages/history.js
@@ -39,8 +39,8 @@ export default function History({ locale, onLocale }) {
           }}
         />
       )}
+      <Nav page={'history'} locale={locale} onLocale={onLocale} />
       <Layout locale={locale} onLocale={onLocale}>
-        <Nav page={'history'} locale={locale} onLocale={onLocale} />
         <div className="home d-flex flex-column">
           <BalanceHeader />
           {(overrideAccount || active) && <TransactionHistory />}
diff --git a/dapp-oeth/src/components/TransactionHistory.js b/dapp-oeth/src/components/TransactionHistory.js
index 51e3cb77a8..52084d6553 100644
--- a/dapp-oeth/src/components/TransactionHistory.js
+++ b/dapp-oeth/src/components/TransactionHistory.js
@@ -295,6 +295,8 @@ const TransactionHistory = ({ isMobile }) => {
         ) : (
           <>
             <div className="filters d-flex justify-content-between">
+              <p className="title">History</p>
+
               <div className="d-flex justify-content-start flex-wrap flex-md-nowrap">
                 <FilterButton
                   filterText={fbt('Received', 'Tx history filter: Received')}
@@ -347,7 +349,7 @@ const TransactionHistory = ({ isMobile }) => {
                 historyPageQuery.isPreviousData ? 'grey-font' : ''
               }`}
             >
-              <div className="d-flex grey-font border-bt pb-10">
+              <div className="d-flex grey-font border-bt">
                 <div className="col-3 col-md-3 pl-0">
                   {fbt('Date', 'Transaction history date')}
                 </div>
@@ -367,35 +369,33 @@ const TransactionHistory = ({ isMobile }) => {
                   {fbt('OETH Balance', 'Transaction history OETH balance')}
                 </div>
               </div>
-              {currentPageHistory
-                .flatMap((r) => Array.from({ length: 7 }).fill(r))
-                .map((tx) => {
-                  return (
+              {currentPageHistory.map((tx) => {
+                return (
+                  <div
+                    key={`${tx.tx_hash}-${tx.log_index ? tx.log_index : 0}`}
+                    className="d-flex border-bt pb-20 pt-20 history-item"
+                  >
                     <div
-                      key={`${tx.tx_hash}-${tx.log_index ? tx.log_index : 0}`}
-                      className="d-flex border-bt pb-20 pt-20 history-item"
-                    >
-                      <div
-                        className="col-3 col-md-3 pl-0"
-                        title={
-                          dateformat(
-                            Date.parse(tx.time),
-                            'mm/dd/yyyy h:MM:ss TT'
-                          ) || ''
-                        }
-                      >
-                        {dateformat(
+                      className="col-3 col-md-3 pl-0"
+                      title={
+                        dateformat(
                           Date.parse(tx.time),
-                          isMobile ? 'mm/dd/yy' : 'mm/dd/yyyy'
-                        ) || ''}
-                      </div>
-                      <div
-                        title={txTypeMap[tx.type].verboseName}
-                        className="col-3 col-md-3 d-flex"
-                      >
-                        {txTypeMap[tx.type].name}
-                      </div>
-                      {/* <div
+                          'mm/dd/yyyy h:MM:ss TT'
+                        ) || ''
+                      }
+                    >
+                      {dateformat(
+                        Date.parse(tx.time),
+                        isMobile ? 'mm/dd/yy' : 'mm/dd/yyyy'
+                      ) || ''}
+                    </div>
+                    <div
+                      title={txTypeMap[tx.type].verboseName}
+                      className="col-3 col-md-3 d-flex"
+                    >
+                      {txTypeMap[tx.type].name}
+                    </div>
+                    {/* <div
                       className={`d-none d-md-flex col-2 ${
                         tx.from_address ? 'clickable' : ''
                       }`}
@@ -427,47 +427,45 @@ const TransactionHistory = ({ isMobile }) => {
                     >
                       {tx.to_address ? shortenAddress(tx.to_address) : '-'}
                     </div> */}
-                      <div className="col-3 col-md-3 d-flex justify-content-end pr-md-5">
-                        {tx.amount ? (
-                          <FormatCurrencyByImportance
-                            value={tx.amount}
-                            isMobile={isMobile}
-                            hasHigherYield={hasHigherYield}
-                            yieldHigherThanAGwei={yieldHigherThanAGwei}
-                          />
-                        ) : (
-                          '-'
-                        )}
-                      </div>
-                      <div className="col-3 col-md-3 d-flex justify-content-end pr-md-5 relative">
-                        {tx.balance ? (
-                          <FormatCurrencyByImportance
-                            value={tx.balance}
-                            isMobile={isMobile}
-                            hasHigherYield={hasHigherYield}
-                            yieldHigherThanAGwei={yieldHigherThanAGwei}
+                    <div className="col-3 col-md-3 d-flex justify-content-end pr-md-5">
+                      {tx.amount ? (
+                        <FormatCurrencyByImportance
+                          value={tx.amount}
+                          isMobile={isMobile}
+                          hasHigherYield={hasHigherYield}
+                          yieldHigherThanAGwei={yieldHigherThanAGwei}
+                        />
+                      ) : (
+                        '-'
+                      )}
+                    </div>
+                    <div className="col-3 col-md-3 d-flex justify-content-end pr-md-5 relative">
+                      {tx.balance ? (
+                        <FormatCurrencyByImportance
+                          value={tx.balance}
+                          isMobile={isMobile}
+                          hasHigherYield={hasHigherYield}
+                          yieldHigherThanAGwei={yieldHigherThanAGwei}
+                        />
+                      ) : (
+                        '-'
+                      )}
+                      <div className="etherscan-link">
+                        <a
+                          href={`https://etherscan.io/tx/${tx.tx_hash}`}
+                          target="_blank"
+                          rel="noopener noreferrer"
+                        >
+                          <img
+                            className=""
+                            src={assetRootPath('/images/link-icon-purple.svg')}
                           />
-                        ) : (
-                          '-'
-                        )}
-                        <div className="etherscan-link">
-                          <a
-                            href={`https://etherscan.io/tx/${tx.tx_hash}`}
-                            target="_blank"
-                            rel="noopener noreferrer"
-                          >
-                            <img
-                              className=""
-                              src={assetRootPath(
-                                '/images/link-icon-purple.svg'
-                              )}
-                            />
-                          </a>
-                        </div>
+                        </a>
                       </div>
                     </div>
-                  )
-                })}
+                  </div>
+                )
+              })}
             </div>
             <div className="pagination d-flex justify-content-center justify-content-md-start">
               {pageNumbers.map((pageNumber, index) => {
@@ -511,10 +509,13 @@ const TransactionHistory = ({ isMobile }) => {
           color: #ebecf2;
         }
 
+        .title {
+          font-size: 14px;
+          margin: 0;
+          color: #fafafb;
+        }
+
         .history-holder {
-          padding-left: 40px;
-          padding-right: 40px;
-          padding-top: 24px;
           background-color: #1e1f25;
         }
 
@@ -554,9 +555,12 @@ const TransactionHistory = ({ isMobile }) => {
         }
 
         .filters {
-          padding: 40px;
+          padding: 28px 40px;
+          margin: 0 0;
           background-color: #1e1f25;
-          border-radius: 10px;
+          border-top-left-radius: 10px;
+          border-top-right-radius: 10px;
+          border-bottom: solid 1px #141519;
         }
 
         .pagination {
@@ -606,7 +610,6 @@ const TransactionHistory = ({ isMobile }) => {
           color: white;
           padding: 4px 20px;
           border-radius: 28px;
-          margin-right: 10px;
           font-family: Lato;
           font-size: 12px;
           cursor: pointer;
diff --git a/dapp-oeth/src/utils/math.js b/dapp-oeth/src/utils/math.js
index 439532b90a..177cd0b3cc 100644
--- a/dapp-oeth/src/utils/math.js
+++ b/dapp-oeth/src/utils/math.js
@@ -104,7 +104,12 @@ export function truncateDecimals(value, decimals = 6) {
     return '0.'
   }
 
-  const [whole, fraction] = value.toString().split('.')
+  const [whole, fraction] = value
+    .toLocaleString(undefined, {
+      useGrouping: false,
+      maximumFractionDigits: 20,
+    })
+    .split('.')
 
   if (!fraction || fraction.length <= decimals) {
     // No change

From 051713bdb4ae57eed124a08e974d8ca70bd6da69 Mon Sep 17 00:00:00 2001
From: Hrik Bhowal <hrik.bhowal@gmail.com>
Date: Wed, 31 May 2023 19:49:19 -0700
Subject: [PATCH 2/5] history route bug fixes and styling

---
 .../src/components/TransactionHistory.js      | 208 +++++++++++-------
 dapp/abis/Flipper.json                        |   4 +-
 2 files changed, 134 insertions(+), 78 deletions(-)

diff --git a/dapp-oeth/src/components/TransactionHistory.js b/dapp-oeth/src/components/TransactionHistory.js
index 52084d6553..ca9099bc57 100644
--- a/dapp-oeth/src/components/TransactionHistory.js
+++ b/dapp-oeth/src/components/TransactionHistory.js
@@ -38,7 +38,7 @@ const FilterButton = ({
           }
         }}
       >
-        <span className="status-text d-none d-md-flex">{filterText}</span>
+        <span className="status-text">{filterText}</span>
         <span className="status-circle"></span>
       </div>
       <style jsx>{`
@@ -62,16 +62,6 @@ const FilterButton = ({
           color: #edf2f5;
         }
 
-        @media (max-width: 799px) {
-          .button {
-            min-width: 50px;
-            min-height: 35px;
-            margin-right: 8px;
-            font-size: 12px;
-            margin-bottom: 20px;
-          }
-        }
-
         .status-circle {
           width: 8px;
           height: 8px;
@@ -91,6 +81,18 @@ const FilterButton = ({
         .status-text {
           margin-right: 8px;
         }
+
+        @media (max-width: 799px) {
+          .button {
+            padding: 4px 12px;
+            margin-right: 8px;
+            font-size: 11px;
+          }
+
+          .status-text {
+            margin-right: 4px;
+          }
+        }
       `}</style>
     </div>
   )
@@ -287,6 +289,45 @@ const TransactionHistory = ({ isMobile }) => {
     }
   }, [historyQuery.isLoading, historyQuery.isRefetching])
 
+  const Filters = () => {
+    return (
+      <div className="d-flex justify-content-start flex-wrap flex-md-nowrap">
+        <FilterButton
+          filterText={fbt('Received', 'Tx history filter: Received')}
+          filterImage="received_icon.svg"
+          filter="transfer_in"
+          filters={filters}
+          setFilters={setFilters}
+          currentFilters={receivedFilters}
+        />
+        <FilterButton
+          filterText={fbt('Sent', 'Tx history filter: Sent')}
+          filterImage="sent_icon.svg"
+          filter="transfer_out"
+          filters={filters}
+          setFilters={setFilters}
+          currentFilters={receivedFilters}
+        />
+        <FilterButton
+          filterText={fbt('Swap', 'Tx history filter: Swap')}
+          filterImage="swap_icon.svg"
+          filter={'swap_oeth'}
+          filters={filters}
+          setFilters={setFilters}
+          currentFilters={receivedFilters}
+        />
+        <FilterButton
+          filterText={fbt('Yield', 'Tx history filter: Yield')}
+          filterImage="yield_icon.svg"
+          filter="yield"
+          filters={filters}
+          setFilters={setFilters}
+          currentFilters={receivedFilters}
+        />
+      </div>
+    )
+  }
+
   return (
     <>
       <div className="d-flex holder flex-column justify-content-start">
@@ -296,40 +337,8 @@ const TransactionHistory = ({ isMobile }) => {
           <>
             <div className="filters d-flex justify-content-between">
               <p className="title">History</p>
-
-              <div className="d-flex justify-content-start flex-wrap flex-md-nowrap">
-                <FilterButton
-                  filterText={fbt('Received', 'Tx history filter: Received')}
-                  filterImage="received_icon.svg"
-                  filter="transfer_in"
-                  filters={filters}
-                  setFilters={setFilters}
-                  currentFilters={receivedFilters}
-                />
-                <FilterButton
-                  filterText={fbt('Sent', 'Tx history filter: Sent')}
-                  filterImage="sent_icon.svg"
-                  filter="transfer_out"
-                  filters={filters}
-                  setFilters={setFilters}
-                  currentFilters={receivedFilters}
-                />
-                <FilterButton
-                  filterText={fbt('Swap', 'Tx history filter: Swap')}
-                  filterImage="swap_icon.svg"
-                  filter={'swap_oeth'}
-                  filters={filters}
-                  setFilters={setFilters}
-                  currentFilters={receivedFilters}
-                />
-                <FilterButton
-                  filterText={fbt('Yield', 'Tx history filter: Yield')}
-                  filterImage="yield_icon.svg"
-                  filter="yield"
-                  filters={filters}
-                  setFilters={setFilters}
-                  currentFilters={receivedFilters}
-                />
+              <div className="d-none d-md-block">
+                <Filters />
               </div>
               <div className="d-flex">
                 <div
@@ -344,16 +353,22 @@ const TransactionHistory = ({ isMobile }) => {
                 </div>
               </div>
             </div>
+            <div className="d-md-none d-block mobile-filters">
+              <Filters />
+            </div>
             <div
               className={`history-holder ${
                 historyPageQuery.isPreviousData ? 'grey-font' : ''
               }`}
             >
-              <div className="d-flex grey-font border-bt">
-                <div className="col-3 col-md-3 pl-0">
+              <div className="d-flex justify-content-between grey-font border-bt title-row">
+                <div className="col-3 col-md-3 d-none d-md-block">
                   {fbt('Date', 'Transaction history date')}
                 </div>
-                <div className="col-3 col-md-3">
+                <div className="col-3 col-md-3 d-block d-md-none">
+                  Date/Type
+                </div>
+                <div className="col-3 col-md-3 d-none d-md-block">
                   {fbt('Type', 'Transaction history type')}
                 </div>
                 {/* <div className="d-none d-md-flex col-2">
@@ -362,10 +377,10 @@ const TransactionHistory = ({ isMobile }) => {
                 <div className="d-none d-md-flex col-2">
                   {fbt('To', 'Transaction history to account')}
                 </div> */}
-                <div className="col-3 col-md-3 d-flex justify-content-end pr-md-5">
+                <div className="col-3 col-md-3">
                   {fbt('Change', 'Transaction history OETH amount')}
                 </div>
-                <div className="col-3 col-md-3 d-flex justify-content-end pr-md-5">
+                <div className="col-3 col-md-3 oeth-balance">
                   {fbt('OETH Balance', 'Transaction history OETH balance')}
                 </div>
               </div>
@@ -373,10 +388,10 @@ const TransactionHistory = ({ isMobile }) => {
                 return (
                   <div
                     key={`${tx.tx_hash}-${tx.log_index ? tx.log_index : 0}`}
-                    className="d-flex border-bt pb-20 pt-20 history-item"
+                    className="d-flex border-bt history-item"
                   >
                     <div
-                      className="col-3 col-md-3 pl-0"
+                      className="col-3 col-md-3 first-history-item"
                       title={
                         dateformat(
                           Date.parse(tx.time),
@@ -388,10 +403,11 @@ const TransactionHistory = ({ isMobile }) => {
                         Date.parse(tx.time),
                         isMobile ? 'mm/dd/yy' : 'mm/dd/yyyy'
                       ) || ''}
+                      <div>{txTypeMap[tx.type].name}</div>
                     </div>
                     <div
                       title={txTypeMap[tx.type].verboseName}
-                      className="col-3 col-md-3 d-flex"
+                      className="col-3 col-md-3 d-none d-md-block"
                     >
                       {txTypeMap[tx.type].name}
                     </div>
@@ -427,7 +443,7 @@ const TransactionHistory = ({ isMobile }) => {
                     >
                       {tx.to_address ? shortenAddress(tx.to_address) : '-'}
                     </div> */}
-                    <div className="col-3 col-md-3 d-flex justify-content-end pr-md-5">
+                    <div className="col-3 col-md-3">
                       {tx.amount ? (
                         <FormatCurrencyByImportance
                           value={tx.amount}
@@ -439,7 +455,7 @@ const TransactionHistory = ({ isMobile }) => {
                         '-'
                       )}
                     </div>
-                    <div className="col-3 col-md-3 d-flex justify-content-end pr-md-5 relative">
+                    <div className="col-3 col-md-3">
                       {tx.balance ? (
                         <FormatCurrencyByImportance
                           value={tx.balance}
@@ -502,6 +518,29 @@ const TransactionHistory = ({ isMobile }) => {
         )}
       </div>
       <style jsx>{`
+        .oeth-balance {
+        }
+
+        .title-row {
+          padding: 24px 40px;
+          width: 100%;
+        }
+
+        .title-row div {
+          padding: 0;
+          width: 25%;
+        }
+
+        .history-item div {
+          width: 25%;
+          padding: 0;
+        }
+
+        .history-item {
+          padding: 24px 40px;
+          font-size: 14px;
+        }
+
         .holder {
           border-radius: 10px;
           box-shadow: 0 0 14px 0 rgba(0, 0, 0, 0.1);
@@ -512,6 +551,8 @@ const TransactionHistory = ({ isMobile }) => {
         .title {
           font-size: 14px;
           margin: 0;
+          padding: 0;
+          height: 23px;
           color: #fafafb;
         }
 
@@ -521,7 +562,7 @@ const TransactionHistory = ({ isMobile }) => {
 
         .grey-font {
           color: #828699;
-          font-size: 12px;
+          font-size: 14px;
         }
 
         .border-bt {
@@ -540,18 +581,13 @@ const TransactionHistory = ({ isMobile }) => {
           padding-top: 20px;
         }
 
-        .history-item {
-          font-size: 14px;
-        }
-
         .type-icon {
           width: 11px;
         }
 
         .etherscan-link {
-          position: absolute;
-          right: 12px;
-          top: 0;
+          display: inline;
+          margin-left: 10px;
         }
 
         .filters {
@@ -625,20 +661,31 @@ const TransactionHistory = ({ isMobile }) => {
           opacity: 80%;
         }
 
+        .mobile-filters {
+          padding: 16px;
+          border-bottom: solid 1px #141519;
+        }
+
         @media (max-width: 799px) {
-          .holder {
-            margin: 0 20px;
+          .grey-font {
+            font-size: 12px;
           }
 
-          .filters {
-            padding: 20px;
-            padding-bottom: 0;
+          .title-row {
+            padding: 16px;
+          }
+
+          .title-row div {
+            min-width: 33%;
           }
 
-          .history-holder {
-            padding-left: 20px;
-            padding-right: 20px;
-            padding-top: 20px;
+          .holder {
+            margin: 0 8px;
+            border-radius: 4px;
+          }
+
+          .filters {
+            padding: 16px;
           }
 
           .etherscan-link {
@@ -663,11 +710,20 @@ const TransactionHistory = ({ isMobile }) => {
             padding: 20px;
           }
 
+          .history-item {
+            width: 100%;
+            padding: 16px;
+            display: flex;
+            justify-content: space-between;
+          }
+
+          .history-item div {
+            min-width: 33%;
+          }
+
           .button {
-            min-width: 80px;
-            min-height: 35px;
-            margin-right: 8px;
-            font-size: 14px;
+            padding: 4px 19px;
+            font-size: 12px;
             margin-bottom: 20px;
           }
         }
diff --git a/dapp/abis/Flipper.json b/dapp/abis/Flipper.json
index 7d064d83af..ae3a548c9d 100644
--- a/dapp/abis/Flipper.json
+++ b/dapp/abis/Flipper.json
@@ -224,8 +224,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x6101006040523480156200001257600080fd5b50604051620018ba380380620018ba833981016040819052620000359162000132565b6200004d336000805160206200189a83398151915255565b6000805160206200189a833981519152546040516001600160a01b03909116906000907fc7c0c772add429241571afb3805861fb3cfa2af374534088b76cdb4325a87e9a908290a36001600160a01b038416620000a957600080fd5b6001600160a01b038316620000bd57600080fd5b6001600160a01b038216620000d157600080fd5b6001600160a01b038116620000e557600080fd5b6001600160601b0319606094851b811660805292841b831660a05290831b821660c05290911b1660e0526200018f565b80516001600160a01b03811681146200012d57600080fd5b919050565b600080600080608085870312156200014957600080fd5b620001548562000115565b9350620001646020860162000115565b9250620001746040860162000115565b9150620001846060860162000115565b905092959194509250565b60805160601c60a05160601c60c05160601c60e05160601c61165c6200023e6000396000818161021d015281816107ed0152818161087b0152610d920152600081816108d00152818161095c01528181610b1a0152610c370152600081816102bd015281816104b40152818161070c0152818161079801528181610aad01528181610e3a01526110260152600081816103cb0152818161062b015281816106b701526109d0015261165c6000f3fe608060405234801561001057600080fd5b50600436106100cf5760003560e01c8063bfc11ffd1161008c578063cb93905311610066578063cb93905314610182578063d38bfff414610195578063f3fef3a3146101a8578063f51b0fd4146101bb57600080fd5b8063bfc11ffd14610144578063c6b6816914610157578063c7af33521461016a57600080fd5b80630c340a24146100d457806335aa0b96146100f95780635981c7461461010e5780635d36b19014610121578063853828b6146101295780638a095a0f14610131575b600080fd5b6100dc6101c3565b6040516001600160a01b0390911681526020015b60405180910390f35b61010c610107366004611486565b6101e0565b005b61010c61011c366004611486565b61038a565b61010c6104eb565b61010c610591565b61010c61013f366004611486565b61098a565b61010c610152366004611486565b610ae6565b61010c610165366004611486565b610c03565b610172610d2d565b60405190151581526020016100f0565b61010c610190366004611486565b610d5e565b61010c6101a336600461141f565b610e75565b61010c6101b636600461143a565b610f19565b61010c610fb8565b60006101db6000805160206116078339815191525490565b905090565b69054b40b1f852bda000008111156102135760405162461bcd60e51b815260040161020a90611562565b60405180910390fd5b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000166323b872dd333061025364e8d4a51000866115b4565b6040518463ffffffff1660e01b8152600401610271939291906114d4565b600060405180830381600087803b15801561028b57600080fd5b505af115801561029f573d6000803e3d6000fd5b505060405163a9059cbb60e01b8152336004820152602481018490527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316925063a9059cbb91506044015b602060405180830381600087803b15801561030c57600080fd5b505af1158015610320573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103449190611464565b6103875760405162461bcd60e51b815260206004820152601460248201527313d554d1081d1c985b9cd9995c8819985a5b195960621b604482015260640161020a565b50565b69054b40b1f852bda000008111156103b45760405162461bcd60e51b815260040161020a90611562565b6040516323b872dd60e01b81526001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016906323b872dd90610404903390309086906004016114d4565b602060405180830381600087803b15801561041e57600080fd5b505af1158015610432573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104569190611464565b6104985760405162461bcd60e51b8152602060048201526013602482015272111052481d1c985b9cd9995c8819985a5b1959606a1b604482015260640161020a565b60405163a9059cbb60e01b8152336004820152602481018290527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063a9059cbb906044016102f2565b7f44c4d30b2eaad5130ad70c3ba6972730566f3e6359ab83e800d905c61b1c51db546001600160a01b0316336001600160a01b0316146105865760405162461bcd60e51b815260206004820152603060248201527f4f6e6c79207468652070656e64696e6720476f7665726e6f722063616e20636f60448201526f6d706c6574652074686520636c61696d60801b606482015260840161020a565b61058f3361109f565b565b610599610d2d565b6105b55760405162461bcd60e51b815260040161020a9061152b565b7f53bf423e48ed90e97d02ab0ebab13b2a235a6bfbe9c321847d5c175333ac4535805460028114156105f95760405162461bcd60e51b815260040161020a9061158c565b600282556106de6106166000805160206116078339815191525490565b6040516370a0823160e01b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906370a082319060240160206040518083038186803b15801561067557600080fd5b505afa158015610689573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106ad919061149f565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169190611160565b6107bf6106f76000805160206116078339815191525490565b6040516370a0823160e01b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906370a082319060240160206040518083038186803b15801561075657600080fd5b505afa15801561076a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061078e919061149f565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169190611160565b6108a26107d86000805160206116078339815191525490565b6040516370a0823160e01b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906370a0823190602401602060405180830381600087803b15801561083957600080fd5b505af115801561084d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610871919061149f565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169190611160565b6109836108bb6000805160206116078339815191525490565b6040516370a0823160e01b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906370a082319060240160206040518083038186803b15801561091a57600080fd5b505afa15801561092e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610952919061149f565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169190611160565b5060019055565b69054b40b1f852bda000008111156109b45760405162461bcd60e51b815260040161020a90611562565b60405163a9059cbb60e01b8152336004820152602481018290527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063a9059cbb90604401602060405180830381600087803b158015610a1c57600080fd5b505af1158015610a30573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a549190611464565b610a965760405162461bcd60e51b8152602060048201526013602482015272111052481d1c985b9cd9995c8819985a5b1959606a1b604482015260640161020a565b6040516323b872dd60e01b81526001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016906323b872dd906102f2903390309086906004016114d4565b69054b40b1f852bda00000811115610b105760405162461bcd60e51b815260040161020a90611562565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000166323b872dd3330610b5064e8d4a51000866115b4565b6040518463ffffffff1660e01b8152600401610b6e939291906114d4565b602060405180830381600087803b158015610b8857600080fd5b505af1158015610b9c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bc09190611464565b6104985760405162461bcd60e51b81526020600482015260146024820152731554d110c81d1c985b9cd9995c8819985a5b195960621b604482015260640161020a565b69054b40b1f852bda00000811115610c2d5760405162461bcd60e51b815260040161020a90611562565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001663a9059cbb33610c6c64e8d4a51000856115b4565b6040516001600160e01b031960e085901b1681526001600160a01b0390921660048301526024820152604401602060405180830381600087803b158015610cb257600080fd5b505af1158015610cc6573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cea9190611464565b610a965760405162461bcd60e51b81526020600482015260146024820152731554d110c81d1c985b9cd9995c8819985a5b195960621b604482015260640161020a565b6000610d456000805160206116078339815191525490565b6001600160a01b0316336001600160a01b031614905090565b69054b40b1f852bda00000811115610d885760405162461bcd60e51b815260040161020a90611562565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001663a9059cbb33610dc764e8d4a51000856115b4565b6040516001600160e01b031960e085901b1681526001600160a01b0390921660048301526024820152604401600060405180830381600087803b158015610e0d57600080fd5b505af1158015610e21573d6000803e3d6000fd5b50506040516323b872dd60e01b81526001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001692506323b872dd91506102f2903390309086906004016114d4565b610e7d610d2d565b610e995760405162461bcd60e51b815260040161020a9061152b565b610ec1817f44c4d30b2eaad5130ad70c3ba6972730566f3e6359ab83e800d905c61b1c51db55565b806001600160a01b0316610ee16000805160206116078339815191525490565b6001600160a01b03167fa39cc5eb22d0f34d8beaefee8a3f17cc229c1a1d1ef87a5ad47313487b1c4f0d60405160405180910390a350565b610f21610d2d565b610f3d5760405162461bcd60e51b815260040161020a9061152b565b7f53bf423e48ed90e97d02ab0ebab13b2a235a6bfbe9c321847d5c175333ac453580546002811415610f815760405162461bcd60e51b815260040161020a9061158c565b60028255610faf610f9e6000805160206116078339815191525490565b6001600160a01b0386169085611160565b50600190555050565b610fc0610d2d565b610fdc5760405162461bcd60e51b815260040161020a9061152b565b7f53bf423e48ed90e97d02ab0ebab13b2a235a6bfbe9c321847d5c175333ac4535805460028114156110205760405162461bcd60e51b815260040161020a9061158c565b600282557f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663f51b0fd46040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561107f57600080fd5b505af1158015611093573d6000803e3d6000fd5b50505050600182555050565b6001600160a01b0381166110f55760405162461bcd60e51b815260206004820152601a60248201527f4e657720476f7665726e6f722069732061646472657373283029000000000000604482015260640161020a565b806001600160a01b03166111156000805160206116078339815191525490565b6001600160a01b03167fc7c0c772add429241571afb3805861fb3cfa2af374534088b76cdb4325a87e9a60405160405180910390a36103878160008051602061160783398151915255565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663a9059cbb60e01b1790526111b29084906111b7565b505050565b600061120c826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166112899092919063ffffffff16565b8051909150156111b2578080602001905181019061122a9190611464565b6111b25760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b606482015260840161020a565b606061129884846000856112a2565b90505b9392505050565b6060824710156113035760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b606482015260840161020a565b843b6113515760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000604482015260640161020a565b600080866001600160a01b0316858760405161136d91906114b8565b60006040518083038185875af1925050503d80600081146113aa576040519150601f19603f3d011682016040523d82523d6000602084013e6113af565b606091505b50915091506113bf8282866113ca565b979650505050505050565b606083156113d957508161129b565b8251156113e95782518084602001fd5b8160405162461bcd60e51b815260040161020a91906114f8565b80356001600160a01b038116811461141a57600080fd5b919050565b60006020828403121561143157600080fd5b61129b82611403565b6000806040838503121561144d57600080fd5b61145683611403565b946020939093013593505050565b60006020828403121561147657600080fd5b8151801515811461129b57600080fd5b60006020828403121561149857600080fd5b5035919050565b6000602082840312156114b157600080fd5b5051919050565b600082516114ca8184602087016115d6565b9190910192915050565b6001600160a01b039384168152919092166020820152604081019190915260600190565b60208152600082518060208401526115178160408501602087016115d6565b601f01601f19169190910160400192915050565b6020808252601a908201527f43616c6c6572206973206e6f742074686520476f7665726e6f72000000000000604082015260600190565b60208082526010908201526f416d6f756e7420746f6f206c6172676560801b604082015260600190565b6020808252600e908201526d1499595b9d1c985b9d0818d85b1b60921b604082015260600190565b6000826115d157634e487b7160e01b600052601260045260246000fd5b500490565b60005b838110156115f15781810151838201526020016115d9565b83811115611600576000848401525b5050505056fe7bea13895fa79d2831e0a9e28edede30099005a50d652d8957cf8a607ee6ca4aa2646970667358221220de5427febdef50e4707714b2e0dfb29a3f79546b9c8b263b0745d60c503c00ee64736f6c634300080700337bea13895fa79d2831e0a9e28edede30099005a50d652d8957cf8a607ee6ca4a",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100cf5760003560e01c8063bfc11ffd1161008c578063cb93905311610066578063cb93905314610182578063d38bfff414610195578063f3fef3a3146101a8578063f51b0fd4146101bb57600080fd5b8063bfc11ffd14610144578063c6b6816914610157578063c7af33521461016a57600080fd5b80630c340a24146100d457806335aa0b96146100f95780635981c7461461010e5780635d36b19014610121578063853828b6146101295780638a095a0f14610131575b600080fd5b6100dc6101c3565b6040516001600160a01b0390911681526020015b60405180910390f35b61010c610107366004611486565b6101e0565b005b61010c61011c366004611486565b61038a565b61010c6104eb565b61010c610591565b61010c61013f366004611486565b61098a565b61010c610152366004611486565b610ae6565b61010c610165366004611486565b610c03565b610172610d2d565b60405190151581526020016100f0565b61010c610190366004611486565b610d5e565b61010c6101a336600461141f565b610e75565b61010c6101b636600461143a565b610f19565b61010c610fb8565b60006101db6000805160206116078339815191525490565b905090565b69054b40b1f852bda000008111156102135760405162461bcd60e51b815260040161020a90611562565b60405180910390fd5b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000166323b872dd333061025364e8d4a51000866115b4565b6040518463ffffffff1660e01b8152600401610271939291906114d4565b600060405180830381600087803b15801561028b57600080fd5b505af115801561029f573d6000803e3d6000fd5b505060405163a9059cbb60e01b8152336004820152602481018490527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316925063a9059cbb91506044015b602060405180830381600087803b15801561030c57600080fd5b505af1158015610320573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103449190611464565b6103875760405162461bcd60e51b815260206004820152601460248201527313d554d1081d1c985b9cd9995c8819985a5b195960621b604482015260640161020a565b50565b69054b40b1f852bda000008111156103b45760405162461bcd60e51b815260040161020a90611562565b6040516323b872dd60e01b81526001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016906323b872dd90610404903390309086906004016114d4565b602060405180830381600087803b15801561041e57600080fd5b505af1158015610432573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104569190611464565b6104985760405162461bcd60e51b8152602060048201526013602482015272111052481d1c985b9cd9995c8819985a5b1959606a1b604482015260640161020a565b60405163a9059cbb60e01b8152336004820152602481018290527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063a9059cbb906044016102f2565b7f44c4d30b2eaad5130ad70c3ba6972730566f3e6359ab83e800d905c61b1c51db546001600160a01b0316336001600160a01b0316146105865760405162461bcd60e51b815260206004820152603060248201527f4f6e6c79207468652070656e64696e6720476f7665726e6f722063616e20636f60448201526f6d706c6574652074686520636c61696d60801b606482015260840161020a565b61058f3361109f565b565b610599610d2d565b6105b55760405162461bcd60e51b815260040161020a9061152b565b7f53bf423e48ed90e97d02ab0ebab13b2a235a6bfbe9c321847d5c175333ac4535805460028114156105f95760405162461bcd60e51b815260040161020a9061158c565b600282556106de6106166000805160206116078339815191525490565b6040516370a0823160e01b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906370a082319060240160206040518083038186803b15801561067557600080fd5b505afa158015610689573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106ad919061149f565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169190611160565b6107bf6106f76000805160206116078339815191525490565b6040516370a0823160e01b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906370a082319060240160206040518083038186803b15801561075657600080fd5b505afa15801561076a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061078e919061149f565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169190611160565b6108a26107d86000805160206116078339815191525490565b6040516370a0823160e01b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906370a0823190602401602060405180830381600087803b15801561083957600080fd5b505af115801561084d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610871919061149f565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169190611160565b6109836108bb6000805160206116078339815191525490565b6040516370a0823160e01b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906370a082319060240160206040518083038186803b15801561091a57600080fd5b505afa15801561092e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610952919061149f565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169190611160565b5060019055565b69054b40b1f852bda000008111156109b45760405162461bcd60e51b815260040161020a90611562565b60405163a9059cbb60e01b8152336004820152602481018290527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063a9059cbb90604401602060405180830381600087803b158015610a1c57600080fd5b505af1158015610a30573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a549190611464565b610a965760405162461bcd60e51b8152602060048201526013602482015272111052481d1c985b9cd9995c8819985a5b1959606a1b604482015260640161020a565b6040516323b872dd60e01b81526001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016906323b872dd906102f2903390309086906004016114d4565b69054b40b1f852bda00000811115610b105760405162461bcd60e51b815260040161020a90611562565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000166323b872dd3330610b5064e8d4a51000866115b4565b6040518463ffffffff1660e01b8152600401610b6e939291906114d4565b602060405180830381600087803b158015610b8857600080fd5b505af1158015610b9c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bc09190611464565b6104985760405162461bcd60e51b81526020600482015260146024820152731554d110c81d1c985b9cd9995c8819985a5b195960621b604482015260640161020a565b69054b40b1f852bda00000811115610c2d5760405162461bcd60e51b815260040161020a90611562565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001663a9059cbb33610c6c64e8d4a51000856115b4565b6040516001600160e01b031960e085901b1681526001600160a01b0390921660048301526024820152604401602060405180830381600087803b158015610cb257600080fd5b505af1158015610cc6573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cea9190611464565b610a965760405162461bcd60e51b81526020600482015260146024820152731554d110c81d1c985b9cd9995c8819985a5b195960621b604482015260640161020a565b6000610d456000805160206116078339815191525490565b6001600160a01b0316336001600160a01b031614905090565b69054b40b1f852bda00000811115610d885760405162461bcd60e51b815260040161020a90611562565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001663a9059cbb33610dc764e8d4a51000856115b4565b6040516001600160e01b031960e085901b1681526001600160a01b0390921660048301526024820152604401600060405180830381600087803b158015610e0d57600080fd5b505af1158015610e21573d6000803e3d6000fd5b50506040516323b872dd60e01b81526001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001692506323b872dd91506102f2903390309086906004016114d4565b610e7d610d2d565b610e995760405162461bcd60e51b815260040161020a9061152b565b610ec1817f44c4d30b2eaad5130ad70c3ba6972730566f3e6359ab83e800d905c61b1c51db55565b806001600160a01b0316610ee16000805160206116078339815191525490565b6001600160a01b03167fa39cc5eb22d0f34d8beaefee8a3f17cc229c1a1d1ef87a5ad47313487b1c4f0d60405160405180910390a350565b610f21610d2d565b610f3d5760405162461bcd60e51b815260040161020a9061152b565b7f53bf423e48ed90e97d02ab0ebab13b2a235a6bfbe9c321847d5c175333ac453580546002811415610f815760405162461bcd60e51b815260040161020a9061158c565b60028255610faf610f9e6000805160206116078339815191525490565b6001600160a01b0386169085611160565b50600190555050565b610fc0610d2d565b610fdc5760405162461bcd60e51b815260040161020a9061152b565b7f53bf423e48ed90e97d02ab0ebab13b2a235a6bfbe9c321847d5c175333ac4535805460028114156110205760405162461bcd60e51b815260040161020a9061158c565b600282557f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663f51b0fd46040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561107f57600080fd5b505af1158015611093573d6000803e3d6000fd5b50505050600182555050565b6001600160a01b0381166110f55760405162461bcd60e51b815260206004820152601a60248201527f4e657720476f7665726e6f722069732061646472657373283029000000000000604482015260640161020a565b806001600160a01b03166111156000805160206116078339815191525490565b6001600160a01b03167fc7c0c772add429241571afb3805861fb3cfa2af374534088b76cdb4325a87e9a60405160405180910390a36103878160008051602061160783398151915255565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663a9059cbb60e01b1790526111b29084906111b7565b505050565b600061120c826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166112899092919063ffffffff16565b8051909150156111b2578080602001905181019061122a9190611464565b6111b25760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b606482015260840161020a565b606061129884846000856112a2565b90505b9392505050565b6060824710156113035760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b606482015260840161020a565b843b6113515760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000604482015260640161020a565b600080866001600160a01b0316858760405161136d91906114b8565b60006040518083038185875af1925050503d80600081146113aa576040519150601f19603f3d011682016040523d82523d6000602084013e6113af565b606091505b50915091506113bf8282866113ca565b979650505050505050565b606083156113d957508161129b565b8251156113e95782518084602001fd5b8160405162461bcd60e51b815260040161020a91906114f8565b80356001600160a01b038116811461141a57600080fd5b919050565b60006020828403121561143157600080fd5b61129b82611403565b6000806040838503121561144d57600080fd5b61145683611403565b946020939093013593505050565b60006020828403121561147657600080fd5b8151801515811461129b57600080fd5b60006020828403121561149857600080fd5b5035919050565b6000602082840312156114b157600080fd5b5051919050565b600082516114ca8184602087016115d6565b9190910192915050565b6001600160a01b039384168152919092166020820152604081019190915260600190565b60208152600082518060208401526115178160408501602087016115d6565b601f01601f19169190910160400192915050565b6020808252601a908201527f43616c6c6572206973206e6f742074686520476f7665726e6f72000000000000604082015260600190565b60208082526010908201526f416d6f756e7420746f6f206c6172676560801b604082015260600190565b6020808252600e908201526d1499595b9d1c985b9d0818d85b1b60921b604082015260600190565b6000826115d157634e487b7160e01b600052601260045260246000fd5b500490565b60005b838110156115f15781810151838201526020016115d9565b83811115611600576000848401525b5050505056fe7bea13895fa79d2831e0a9e28edede30099005a50d652d8957cf8a607ee6ca4aa2646970667358221220de5427febdef50e4707714b2e0dfb29a3f79546b9c8b263b0745d60c503c00ee64736f6c63430008070033",
+  "bytecode": "0x6101006040523480156200001257600080fd5b50604051620018ba380380620018ba833981016040819052620000359162000132565b6200004d336000805160206200189a83398151915255565b6000805160206200189a833981519152546040516001600160a01b03909116906000907fc7c0c772add429241571afb3805861fb3cfa2af374534088b76cdb4325a87e9a908290a36001600160a01b038416620000a957600080fd5b6001600160a01b038316620000bd57600080fd5b6001600160a01b038216620000d157600080fd5b6001600160a01b038116620000e557600080fd5b6001600160601b0319606094851b811660805292841b831660a05290831b821660c05290911b1660e0526200018f565b80516001600160a01b03811681146200012d57600080fd5b919050565b600080600080608085870312156200014957600080fd5b620001548562000115565b9350620001646020860162000115565b9250620001746040860162000115565b9150620001846060860162000115565b905092959194509250565b60805160601c60a05160601c60c05160601c60e05160601c61165c6200023e6000396000818161021d015281816107ed0152818161087b0152610d920152600081816108d00152818161095c01528181610b1a0152610c370152600081816102bd015281816104b40152818161070c0152818161079801528181610aad01528181610e3a01526110260152600081816103cb0152818161062b015281816106b701526109d0015261165c6000f3fe608060405234801561001057600080fd5b50600436106100cf5760003560e01c8063bfc11ffd1161008c578063cb93905311610066578063cb93905314610182578063d38bfff414610195578063f3fef3a3146101a8578063f51b0fd4146101bb57600080fd5b8063bfc11ffd14610144578063c6b6816914610157578063c7af33521461016a57600080fd5b80630c340a24146100d457806335aa0b96146100f95780635981c7461461010e5780635d36b19014610121578063853828b6146101295780638a095a0f14610131575b600080fd5b6100dc6101c3565b6040516001600160a01b0390911681526020015b60405180910390f35b61010c610107366004611486565b6101e0565b005b61010c61011c366004611486565b61038a565b61010c6104eb565b61010c610591565b61010c61013f366004611486565b61098a565b61010c610152366004611486565b610ae6565b61010c610165366004611486565b610c03565b610172610d2d565b60405190151581526020016100f0565b61010c610190366004611486565b610d5e565b61010c6101a336600461141f565b610e75565b61010c6101b636600461143a565b610f19565b61010c610fb8565b60006101db6000805160206116078339815191525490565b905090565b69054b40b1f852bda000008111156102135760405162461bcd60e51b815260040161020a90611562565b60405180910390fd5b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000166323b872dd333061025364e8d4a51000866115b4565b6040518463ffffffff1660e01b8152600401610271939291906114d4565b600060405180830381600087803b15801561028b57600080fd5b505af115801561029f573d6000803e3d6000fd5b505060405163a9059cbb60e01b8152336004820152602481018490527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316925063a9059cbb91506044015b602060405180830381600087803b15801561030c57600080fd5b505af1158015610320573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103449190611464565b6103875760405162461bcd60e51b815260206004820152601460248201527313d554d1081d1c985b9cd9995c8819985a5b195960621b604482015260640161020a565b50565b69054b40b1f852bda000008111156103b45760405162461bcd60e51b815260040161020a90611562565b6040516323b872dd60e01b81526001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016906323b872dd90610404903390309086906004016114d4565b602060405180830381600087803b15801561041e57600080fd5b505af1158015610432573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104569190611464565b6104985760405162461bcd60e51b8152602060048201526013602482015272111052481d1c985b9cd9995c8819985a5b1959606a1b604482015260640161020a565b60405163a9059cbb60e01b8152336004820152602481018290527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063a9059cbb906044016102f2565b7f44c4d30b2eaad5130ad70c3ba6972730566f3e6359ab83e800d905c61b1c51db546001600160a01b0316336001600160a01b0316146105865760405162461bcd60e51b815260206004820152603060248201527f4f6e6c79207468652070656e64696e6720476f7665726e6f722063616e20636f60448201526f6d706c6574652074686520636c61696d60801b606482015260840161020a565b61058f3361109f565b565b610599610d2d565b6105b55760405162461bcd60e51b815260040161020a9061152b565b7f53bf423e48ed90e97d02ab0ebab13b2a235a6bfbe9c321847d5c175333ac4535805460028114156105f95760405162461bcd60e51b815260040161020a9061158c565b600282556106de6106166000805160206116078339815191525490565b6040516370a0823160e01b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906370a082319060240160206040518083038186803b15801561067557600080fd5b505afa158015610689573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106ad919061149f565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169190611160565b6107bf6106f76000805160206116078339815191525490565b6040516370a0823160e01b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906370a082319060240160206040518083038186803b15801561075657600080fd5b505afa15801561076a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061078e919061149f565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169190611160565b6108a26107d86000805160206116078339815191525490565b6040516370a0823160e01b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906370a0823190602401602060405180830381600087803b15801561083957600080fd5b505af115801561084d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610871919061149f565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169190611160565b6109836108bb6000805160206116078339815191525490565b6040516370a0823160e01b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906370a082319060240160206040518083038186803b15801561091a57600080fd5b505afa15801561092e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610952919061149f565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169190611160565b5060019055565b69054b40b1f852bda000008111156109b45760405162461bcd60e51b815260040161020a90611562565b60405163a9059cbb60e01b8152336004820152602481018290527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063a9059cbb90604401602060405180830381600087803b158015610a1c57600080fd5b505af1158015610a30573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a549190611464565b610a965760405162461bcd60e51b8152602060048201526013602482015272111052481d1c985b9cd9995c8819985a5b1959606a1b604482015260640161020a565b6040516323b872dd60e01b81526001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016906323b872dd906102f2903390309086906004016114d4565b69054b40b1f852bda00000811115610b105760405162461bcd60e51b815260040161020a90611562565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000166323b872dd3330610b5064e8d4a51000866115b4565b6040518463ffffffff1660e01b8152600401610b6e939291906114d4565b602060405180830381600087803b158015610b8857600080fd5b505af1158015610b9c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bc09190611464565b6104985760405162461bcd60e51b81526020600482015260146024820152731554d110c81d1c985b9cd9995c8819985a5b195960621b604482015260640161020a565b69054b40b1f852bda00000811115610c2d5760405162461bcd60e51b815260040161020a90611562565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001663a9059cbb33610c6c64e8d4a51000856115b4565b6040516001600160e01b031960e085901b1681526001600160a01b0390921660048301526024820152604401602060405180830381600087803b158015610cb257600080fd5b505af1158015610cc6573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cea9190611464565b610a965760405162461bcd60e51b81526020600482015260146024820152731554d110c81d1c985b9cd9995c8819985a5b195960621b604482015260640161020a565b6000610d456000805160206116078339815191525490565b6001600160a01b0316336001600160a01b031614905090565b69054b40b1f852bda00000811115610d885760405162461bcd60e51b815260040161020a90611562565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001663a9059cbb33610dc764e8d4a51000856115b4565b6040516001600160e01b031960e085901b1681526001600160a01b0390921660048301526024820152604401600060405180830381600087803b158015610e0d57600080fd5b505af1158015610e21573d6000803e3d6000fd5b50506040516323b872dd60e01b81526001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001692506323b872dd91506102f2903390309086906004016114d4565b610e7d610d2d565b610e995760405162461bcd60e51b815260040161020a9061152b565b610ec1817f44c4d30b2eaad5130ad70c3ba6972730566f3e6359ab83e800d905c61b1c51db55565b806001600160a01b0316610ee16000805160206116078339815191525490565b6001600160a01b03167fa39cc5eb22d0f34d8beaefee8a3f17cc229c1a1d1ef87a5ad47313487b1c4f0d60405160405180910390a350565b610f21610d2d565b610f3d5760405162461bcd60e51b815260040161020a9061152b565b7f53bf423e48ed90e97d02ab0ebab13b2a235a6bfbe9c321847d5c175333ac453580546002811415610f815760405162461bcd60e51b815260040161020a9061158c565b60028255610faf610f9e6000805160206116078339815191525490565b6001600160a01b0386169085611160565b50600190555050565b610fc0610d2d565b610fdc5760405162461bcd60e51b815260040161020a9061152b565b7f53bf423e48ed90e97d02ab0ebab13b2a235a6bfbe9c321847d5c175333ac4535805460028114156110205760405162461bcd60e51b815260040161020a9061158c565b600282557f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663f51b0fd46040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561107f57600080fd5b505af1158015611093573d6000803e3d6000fd5b50505050600182555050565b6001600160a01b0381166110f55760405162461bcd60e51b815260206004820152601a60248201527f4e657720476f7665726e6f722069732061646472657373283029000000000000604482015260640161020a565b806001600160a01b03166111156000805160206116078339815191525490565b6001600160a01b03167fc7c0c772add429241571afb3805861fb3cfa2af374534088b76cdb4325a87e9a60405160405180910390a36103878160008051602061160783398151915255565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663a9059cbb60e01b1790526111b29084906111b7565b505050565b600061120c826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166112899092919063ffffffff16565b8051909150156111b2578080602001905181019061122a9190611464565b6111b25760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b606482015260840161020a565b606061129884846000856112a2565b90505b9392505050565b6060824710156113035760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b606482015260840161020a565b843b6113515760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000604482015260640161020a565b600080866001600160a01b0316858760405161136d91906114b8565b60006040518083038185875af1925050503d80600081146113aa576040519150601f19603f3d011682016040523d82523d6000602084013e6113af565b606091505b50915091506113bf8282866113ca565b979650505050505050565b606083156113d957508161129b565b8251156113e95782518084602001fd5b8160405162461bcd60e51b815260040161020a91906114f8565b80356001600160a01b038116811461141a57600080fd5b919050565b60006020828403121561143157600080fd5b61129b82611403565b6000806040838503121561144d57600080fd5b61145683611403565b946020939093013593505050565b60006020828403121561147657600080fd5b8151801515811461129b57600080fd5b60006020828403121561149857600080fd5b5035919050565b6000602082840312156114b157600080fd5b5051919050565b600082516114ca8184602087016115d6565b9190910192915050565b6001600160a01b039384168152919092166020820152604081019190915260600190565b60208152600082518060208401526115178160408501602087016115d6565b601f01601f19169190910160400192915050565b6020808252601a908201527f43616c6c6572206973206e6f742074686520476f7665726e6f72000000000000604082015260600190565b60208082526010908201526f416d6f756e7420746f6f206c6172676560801b604082015260600190565b6020808252600e908201526d1499595b9d1c985b9d0818d85b1b60921b604082015260600190565b6000826115d157634e487b7160e01b600052601260045260246000fd5b500490565b60005b838110156115f15781810151838201526020016115d9565b83811115611600576000848401525b5050505056fe7bea13895fa79d2831e0a9e28edede30099005a50d652d8957cf8a607ee6ca4aa264697066735822122060627eb094f2c9ae0acd53bfea289004fac1f1e34602265ad04f748612a2d87c64736f6c634300080700337bea13895fa79d2831e0a9e28edede30099005a50d652d8957cf8a607ee6ca4a",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100cf5760003560e01c8063bfc11ffd1161008c578063cb93905311610066578063cb93905314610182578063d38bfff414610195578063f3fef3a3146101a8578063f51b0fd4146101bb57600080fd5b8063bfc11ffd14610144578063c6b6816914610157578063c7af33521461016a57600080fd5b80630c340a24146100d457806335aa0b96146100f95780635981c7461461010e5780635d36b19014610121578063853828b6146101295780638a095a0f14610131575b600080fd5b6100dc6101c3565b6040516001600160a01b0390911681526020015b60405180910390f35b61010c610107366004611486565b6101e0565b005b61010c61011c366004611486565b61038a565b61010c6104eb565b61010c610591565b61010c61013f366004611486565b61098a565b61010c610152366004611486565b610ae6565b61010c610165366004611486565b610c03565b610172610d2d565b60405190151581526020016100f0565b61010c610190366004611486565b610d5e565b61010c6101a336600461141f565b610e75565b61010c6101b636600461143a565b610f19565b61010c610fb8565b60006101db6000805160206116078339815191525490565b905090565b69054b40b1f852bda000008111156102135760405162461bcd60e51b815260040161020a90611562565b60405180910390fd5b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000166323b872dd333061025364e8d4a51000866115b4565b6040518463ffffffff1660e01b8152600401610271939291906114d4565b600060405180830381600087803b15801561028b57600080fd5b505af115801561029f573d6000803e3d6000fd5b505060405163a9059cbb60e01b8152336004820152602481018490527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316925063a9059cbb91506044015b602060405180830381600087803b15801561030c57600080fd5b505af1158015610320573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103449190611464565b6103875760405162461bcd60e51b815260206004820152601460248201527313d554d1081d1c985b9cd9995c8819985a5b195960621b604482015260640161020a565b50565b69054b40b1f852bda000008111156103b45760405162461bcd60e51b815260040161020a90611562565b6040516323b872dd60e01b81526001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016906323b872dd90610404903390309086906004016114d4565b602060405180830381600087803b15801561041e57600080fd5b505af1158015610432573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104569190611464565b6104985760405162461bcd60e51b8152602060048201526013602482015272111052481d1c985b9cd9995c8819985a5b1959606a1b604482015260640161020a565b60405163a9059cbb60e01b8152336004820152602481018290527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063a9059cbb906044016102f2565b7f44c4d30b2eaad5130ad70c3ba6972730566f3e6359ab83e800d905c61b1c51db546001600160a01b0316336001600160a01b0316146105865760405162461bcd60e51b815260206004820152603060248201527f4f6e6c79207468652070656e64696e6720476f7665726e6f722063616e20636f60448201526f6d706c6574652074686520636c61696d60801b606482015260840161020a565b61058f3361109f565b565b610599610d2d565b6105b55760405162461bcd60e51b815260040161020a9061152b565b7f53bf423e48ed90e97d02ab0ebab13b2a235a6bfbe9c321847d5c175333ac4535805460028114156105f95760405162461bcd60e51b815260040161020a9061158c565b600282556106de6106166000805160206116078339815191525490565b6040516370a0823160e01b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906370a082319060240160206040518083038186803b15801561067557600080fd5b505afa158015610689573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106ad919061149f565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169190611160565b6107bf6106f76000805160206116078339815191525490565b6040516370a0823160e01b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906370a082319060240160206040518083038186803b15801561075657600080fd5b505afa15801561076a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061078e919061149f565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169190611160565b6108a26107d86000805160206116078339815191525490565b6040516370a0823160e01b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906370a0823190602401602060405180830381600087803b15801561083957600080fd5b505af115801561084d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610871919061149f565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169190611160565b6109836108bb6000805160206116078339815191525490565b6040516370a0823160e01b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906370a082319060240160206040518083038186803b15801561091a57600080fd5b505afa15801561092e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610952919061149f565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169190611160565b5060019055565b69054b40b1f852bda000008111156109b45760405162461bcd60e51b815260040161020a90611562565b60405163a9059cbb60e01b8152336004820152602481018290527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063a9059cbb90604401602060405180830381600087803b158015610a1c57600080fd5b505af1158015610a30573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a549190611464565b610a965760405162461bcd60e51b8152602060048201526013602482015272111052481d1c985b9cd9995c8819985a5b1959606a1b604482015260640161020a565b6040516323b872dd60e01b81526001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016906323b872dd906102f2903390309086906004016114d4565b69054b40b1f852bda00000811115610b105760405162461bcd60e51b815260040161020a90611562565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000166323b872dd3330610b5064e8d4a51000866115b4565b6040518463ffffffff1660e01b8152600401610b6e939291906114d4565b602060405180830381600087803b158015610b8857600080fd5b505af1158015610b9c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bc09190611464565b6104985760405162461bcd60e51b81526020600482015260146024820152731554d110c81d1c985b9cd9995c8819985a5b195960621b604482015260640161020a565b69054b40b1f852bda00000811115610c2d5760405162461bcd60e51b815260040161020a90611562565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001663a9059cbb33610c6c64e8d4a51000856115b4565b6040516001600160e01b031960e085901b1681526001600160a01b0390921660048301526024820152604401602060405180830381600087803b158015610cb257600080fd5b505af1158015610cc6573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cea9190611464565b610a965760405162461bcd60e51b81526020600482015260146024820152731554d110c81d1c985b9cd9995c8819985a5b195960621b604482015260640161020a565b6000610d456000805160206116078339815191525490565b6001600160a01b0316336001600160a01b031614905090565b69054b40b1f852bda00000811115610d885760405162461bcd60e51b815260040161020a90611562565b6001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001663a9059cbb33610dc764e8d4a51000856115b4565b6040516001600160e01b031960e085901b1681526001600160a01b0390921660048301526024820152604401600060405180830381600087803b158015610e0d57600080fd5b505af1158015610e21573d6000803e3d6000fd5b50506040516323b872dd60e01b81526001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001692506323b872dd91506102f2903390309086906004016114d4565b610e7d610d2d565b610e995760405162461bcd60e51b815260040161020a9061152b565b610ec1817f44c4d30b2eaad5130ad70c3ba6972730566f3e6359ab83e800d905c61b1c51db55565b806001600160a01b0316610ee16000805160206116078339815191525490565b6001600160a01b03167fa39cc5eb22d0f34d8beaefee8a3f17cc229c1a1d1ef87a5ad47313487b1c4f0d60405160405180910390a350565b610f21610d2d565b610f3d5760405162461bcd60e51b815260040161020a9061152b565b7f53bf423e48ed90e97d02ab0ebab13b2a235a6bfbe9c321847d5c175333ac453580546002811415610f815760405162461bcd60e51b815260040161020a9061158c565b60028255610faf610f9e6000805160206116078339815191525490565b6001600160a01b0386169085611160565b50600190555050565b610fc0610d2d565b610fdc5760405162461bcd60e51b815260040161020a9061152b565b7f53bf423e48ed90e97d02ab0ebab13b2a235a6bfbe9c321847d5c175333ac4535805460028114156110205760405162461bcd60e51b815260040161020a9061158c565b600282557f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663f51b0fd46040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561107f57600080fd5b505af1158015611093573d6000803e3d6000fd5b50505050600182555050565b6001600160a01b0381166110f55760405162461bcd60e51b815260206004820152601a60248201527f4e657720476f7665726e6f722069732061646472657373283029000000000000604482015260640161020a565b806001600160a01b03166111156000805160206116078339815191525490565b6001600160a01b03167fc7c0c772add429241571afb3805861fb3cfa2af374534088b76cdb4325a87e9a60405160405180910390a36103878160008051602061160783398151915255565b604080516001600160a01b038416602482015260448082018490528251808303909101815260649091019091526020810180516001600160e01b031663a9059cbb60e01b1790526111b29084906111b7565b505050565b600061120c826040518060400160405280602081526020017f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564815250856001600160a01b03166112899092919063ffffffff16565b8051909150156111b2578080602001905181019061122a9190611464565b6111b25760405162461bcd60e51b815260206004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b606482015260840161020a565b606061129884846000856112a2565b90505b9392505050565b6060824710156113035760405162461bcd60e51b815260206004820152602660248201527f416464726573733a20696e73756666696369656e742062616c616e636520666f6044820152651c8818d85b1b60d21b606482015260840161020a565b843b6113515760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000604482015260640161020a565b600080866001600160a01b0316858760405161136d91906114b8565b60006040518083038185875af1925050503d80600081146113aa576040519150601f19603f3d011682016040523d82523d6000602084013e6113af565b606091505b50915091506113bf8282866113ca565b979650505050505050565b606083156113d957508161129b565b8251156113e95782518084602001fd5b8160405162461bcd60e51b815260040161020a91906114f8565b80356001600160a01b038116811461141a57600080fd5b919050565b60006020828403121561143157600080fd5b61129b82611403565b6000806040838503121561144d57600080fd5b61145683611403565b946020939093013593505050565b60006020828403121561147657600080fd5b8151801515811461129b57600080fd5b60006020828403121561149857600080fd5b5035919050565b6000602082840312156114b157600080fd5b5051919050565b600082516114ca8184602087016115d6565b9190910192915050565b6001600160a01b039384168152919092166020820152604081019190915260600190565b60208152600082518060208401526115178160408501602087016115d6565b601f01601f19169190910160400192915050565b6020808252601a908201527f43616c6c6572206973206e6f742074686520476f7665726e6f72000000000000604082015260600190565b60208082526010908201526f416d6f756e7420746f6f206c6172676560801b604082015260600190565b6020808252600e908201526d1499595b9d1c985b9d0818d85b1b60921b604082015260600190565b6000826115d157634e487b7160e01b600052601260045260246000fd5b500490565b60005b838110156115f15781810151838201526020016115d9565b83811115611600576000848401525b5050505056fe7bea13895fa79d2831e0a9e28edede30099005a50d652d8957cf8a607ee6ca4aa264697066735822122060627eb094f2c9ae0acd53bfea289004fac1f1e34602265ad04f748612a2d87c64736f6c63430008070033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

From fa6b0c105f70a58a8e3a1a6729806700e2d7a769 Mon Sep 17 00:00:00 2001
From: Hrik Bhowal <hrik.bhowal@gmail.com>
Date: Thu, 1 Jun 2023 05:04:21 -0700
Subject: [PATCH 3/5] disconnected state

---
 dapp-oeth/pages/history.js                    |  28 +-
 dapp-oeth/src/components/GetOUSD.js           |  17 +-
 .../src/components/TransactionHistory.js      | 308 +++++++++++-------
 3 files changed, 207 insertions(+), 146 deletions(-)

diff --git a/dapp-oeth/pages/history.js b/dapp-oeth/pages/history.js
index 7c148194d8..3f978f9135 100644
--- a/dapp-oeth/pages/history.js
+++ b/dapp-oeth/pages/history.js
@@ -6,8 +6,6 @@ import Layout from 'components/layout'
 import Nav from 'components/Nav'
 import BalanceHeader from 'components/buySell/BalanceHeader'
 import TransactionHistory from 'components/TransactionHistory'
-import GetOUSD from 'components/GetOUSD'
-import { assetRootPath } from 'utils/image'
 import { useOverrideAccount } from '../src/utils/hooks'
 import ErrorModal from '../src/components/buySell/ErrorModal'
 
@@ -43,34 +41,10 @@ export default function History({ locale, onLocale }) {
       <Layout locale={locale} onLocale={onLocale}>
         <div className="home d-flex flex-column">
           <BalanceHeader />
-          {(overrideAccount || active) && <TransactionHistory />}
-          {!overrideAccount && !active && (
-            <div className="empty-placeholder d-flex flex-column align-items-center justify-content-start">
-              <img src={assetRootPath('/images/wallet-icons.svg')} />
-              <div className="header-text">
-                {fbt('No wallet connected', 'Disconnected dapp message')}
-              </div>
-              <div className="subtext">
-                {fbt(
-                  'Please connect an Ethereum wallet',
-                  'Disconnected dapp subtext'
-                )}
-              </div>
-              <GetOUSD primary connect trackSource="Dapp widget body" />
-            </div>
-          )}
+          <TransactionHistory />
         </div>
       </Layout>
       <style jsx>{`
-        .empty-placeholder {
-          min-height: 470px;
-          height: 100%;
-          padding: 70px;
-          border-radius: 10px;
-          border-top: solid 1px #cdd7e0;
-          background-color: #fafbfc;
-        }
-
         .header-text {
           font-size: 22px;
           line-height: 0.86;
diff --git a/dapp-oeth/src/components/GetOUSD.js b/dapp-oeth/src/components/GetOUSD.js
index eb98f9ba7b..d847ac6ef9 100644
--- a/dapp-oeth/src/components/GetOUSD.js
+++ b/dapp-oeth/src/components/GetOUSD.js
@@ -19,6 +19,7 @@ const GetOUSD = ({
   showLogin,
   trackSource,
   light2,
+  gradient,
   zIndex2,
   navMarble,
 }) => {
@@ -33,6 +34,7 @@ const GetOUSD = ({
     light && 'btn-light',
     light2 && 'btn-light2',
     primary && 'btn-primary',
+    gradient && 'btn-gradient',
     zIndex2 && 'zIndex2',
     navMarble && 'nav-marble'
   )
@@ -72,12 +74,21 @@ const GetOUSD = ({
       </button>
       <style jsx>{`
         .btn {
-          font-size: 1.125rem;
+          font-size: 1rem;
           font-weight: bold;
           border-radius: 25px;
           padding: 0;
         }
 
+        .btn-gradient {
+          background-image: linear-gradient(
+            90deg,
+            #8c66fc -28.99%,
+            #0274f1 144.97%
+          );
+          color: white;
+        }
+
         .zIndex2 {
           position: relative;
           z-index: 2;
@@ -109,6 +120,10 @@ const GetOUSD = ({
             width: 100%;
           }
 
+          .max-w-107 {
+            max-width: 107px;
+          }
+
           .nav-marble {
             width: auto;
             color: #fafbfb;
diff --git a/dapp-oeth/src/components/TransactionHistory.js b/dapp-oeth/src/components/TransactionHistory.js
index ca9099bc57..258359b0ad 100644
--- a/dapp-oeth/src/components/TransactionHistory.js
+++ b/dapp-oeth/src/components/TransactionHistory.js
@@ -1,7 +1,9 @@
 import React, { useEffect, useState, useMemo } from 'react'
-import { useRouter } from 'next/router'
+import GetOUSD from 'components/GetOUSD'
+import useTransactionHistoryPageQuery from '../queries/useTransactionHistoryPageQuery'
+import useTransactionHistoryQuery from '../queries/useTransactionHistoryQuery'
 import dateformat from 'dateformat'
-
+import { useRouter } from 'next/router'
 import { fbt } from 'fbt-runtime'
 import { useWeb3React } from '@web3-react/core'
 import { formatCurrency } from '../utils/math'
@@ -10,9 +12,6 @@ import withIsMobile from 'hoc/withIsMobile'
 import { assetRootPath } from 'utils/image'
 import { transactionHistoryItemsPerPage } from 'utils/constants'
 
-import useTransactionHistoryPageQuery from '../queries/useTransactionHistoryPageQuery'
-import useTransactionHistoryQuery from '../queries/useTransactionHistoryQuery'
-
 const itemsPerPage = transactionHistoryItemsPerPage
 
 const FilterButton = ({
@@ -328,6 +327,37 @@ const TransactionHistory = ({ isMobile }) => {
     )
   }
 
+  const EmptyPlaceholder = ({ children }) => {
+    return (
+      <>
+        <div className="empty-placeholder d-flex flex-column align-items-center justify-content-center">
+          {children}
+        </div>
+        <style jsx>
+          {`
+            .empty-placeholder {
+              height: 370px;
+              padding: 40px;
+              border-radius: 10px;
+              background-color: #1e1f25;
+              border-bottom-left-radius: 8px;
+              border-bottom-right-radius: 8px;
+            }
+
+            @media (max-width: 799px) {
+              .empty-placeholder {
+                height: 220px;
+                padding: 16px;
+                border-bottom-left-radius: 4px;
+                border-bottom-right-radius: 4px;
+              }
+            }
+          `}
+        </style>
+      </>
+    )
+  }
+
   return (
     <>
       <div className="d-flex holder flex-column justify-content-start">
@@ -361,57 +391,61 @@ const TransactionHistory = ({ isMobile }) => {
                 historyPageQuery.isPreviousData ? 'grey-font' : ''
               }`}
             >
-              <div className="d-flex justify-content-between grey-font border-bt title-row">
-                <div className="col-3 col-md-3 d-none d-md-block">
-                  {fbt('Date', 'Transaction history date')}
-                </div>
-                <div className="col-3 col-md-3 d-block d-md-none">
-                  Date/Type
-                </div>
-                <div className="col-3 col-md-3 d-none d-md-block">
-                  {fbt('Type', 'Transaction history type')}
-                </div>
-                {/* <div className="d-none d-md-flex col-2">
+              {(overrideAccount || active) && (
+                <>
+                  <div className="d-flex justify-content-between grey-font border-bt title-row">
+                    <div className="col-3 col-md-3 d-none d-md-block">
+                      {fbt('Date', 'Transaction history date')}
+                    </div>
+                    <div className="col-3 col-md-3 d-block d-md-none">
+                      Date/Type
+                    </div>
+                    <div className="col-3 col-md-3 d-none d-md-block">
+                      {fbt('Type', 'Transaction history type')}
+                    </div>
+                    {/* <div className="d-none d-md-flex col-2">
                   {fbt('From', 'Transaction history from account')}
                 </div>
                 <div className="d-none d-md-flex col-2">
                   {fbt('To', 'Transaction history to account')}
                 </div> */}
-                <div className="col-3 col-md-3">
-                  {fbt('Change', 'Transaction history OETH amount')}
-                </div>
-                <div className="col-3 col-md-3 oeth-balance">
-                  {fbt('OETH Balance', 'Transaction history OETH balance')}
-                </div>
-              </div>
-              {currentPageHistory.map((tx) => {
-                return (
-                  <div
-                    key={`${tx.tx_hash}-${tx.log_index ? tx.log_index : 0}`}
-                    className="d-flex border-bt history-item"
-                  >
-                    <div
-                      className="col-3 col-md-3 first-history-item"
-                      title={
-                        dateformat(
-                          Date.parse(tx.time),
-                          'mm/dd/yyyy h:MM:ss TT'
-                        ) || ''
-                      }
-                    >
-                      {dateformat(
-                        Date.parse(tx.time),
-                        isMobile ? 'mm/dd/yy' : 'mm/dd/yyyy'
-                      ) || ''}
-                      <div>{txTypeMap[tx.type].name}</div>
+                    <div className="col-3 col-md-3">
+                      {fbt('Change', 'Transaction history OETH amount')}
                     </div>
-                    <div
-                      title={txTypeMap[tx.type].verboseName}
-                      className="col-3 col-md-3 d-none d-md-block"
-                    >
-                      {txTypeMap[tx.type].name}
+                    <div className="col-3 col-md-3 oeth-balance">
+                      {fbt('OETH Balance', 'Transaction history OETH balance')}
                     </div>
-                    {/* <div
+                  </div>
+                  {currentPageHistory.map((tx) => {
+                    return (
+                      <div
+                        key={`${tx.tx_hash}-${tx.log_index ? tx.log_index : 0}`}
+                        className="d-flex border-bt history-item"
+                      >
+                        <div
+                          className="col-3 col-md-3"
+                          title={
+                            dateformat(
+                              Date.parse(tx.time),
+                              'mm/dd/yyyy h:MM:ss TT'
+                            ) || ''
+                          }
+                        >
+                          {dateformat(
+                            Date.parse(tx.time),
+                            isMobile ? 'mm/dd/yy' : 'mm/dd/yyyy'
+                          ) || ''}
+                          <div className="d-block d-md-none">
+                            {txTypeMap[tx.type].name}
+                          </div>
+                        </div>
+                        <div
+                          title={txTypeMap[tx.type].verboseName}
+                          className="col-3 col-md-3 d-none d-md-block"
+                        >
+                          {txTypeMap[tx.type].name}
+                        </div>
+                        {/* <div
                       className={`d-none d-md-flex col-2 ${
                         tx.from_address ? 'clickable' : ''
                       }`}
@@ -443,82 +477,106 @@ const TransactionHistory = ({ isMobile }) => {
                     >
                       {tx.to_address ? shortenAddress(tx.to_address) : '-'}
                     </div> */}
-                    <div className="col-3 col-md-3">
-                      {tx.amount ? (
-                        <FormatCurrencyByImportance
-                          value={tx.amount}
-                          isMobile={isMobile}
-                          hasHigherYield={hasHigherYield}
-                          yieldHigherThanAGwei={yieldHigherThanAGwei}
-                        />
-                      ) : (
-                        '-'
-                      )}
-                    </div>
-                    <div className="col-3 col-md-3">
-                      {tx.balance ? (
-                        <FormatCurrencyByImportance
-                          value={tx.balance}
-                          isMobile={isMobile}
-                          hasHigherYield={hasHigherYield}
-                          yieldHigherThanAGwei={yieldHigherThanAGwei}
-                        />
-                      ) : (
-                        '-'
-                      )}
-                      <div className="etherscan-link">
-                        <a
-                          href={`https://etherscan.io/tx/${tx.tx_hash}`}
-                          target="_blank"
-                          rel="noopener noreferrer"
-                        >
-                          <img
-                            className=""
-                            src={assetRootPath('/images/link-icon-purple.svg')}
-                          />
-                        </a>
+                        <div className="col-3 col-md-3">
+                          {tx.amount ? (
+                            <FormatCurrencyByImportance
+                              value={tx.amount}
+                              isMobile={isMobile}
+                              hasHigherYield={hasHigherYield}
+                              yieldHigherThanAGwei={yieldHigherThanAGwei}
+                            />
+                          ) : (
+                            '-'
+                          )}
+                        </div>
+                        <div className="col-3 col-md-3">
+                          {tx.balance ? (
+                            <FormatCurrencyByImportance
+                              value={tx.balance}
+                              isMobile={isMobile}
+                              hasHigherYield={hasHigherYield}
+                              yieldHigherThanAGwei={yieldHigherThanAGwei}
+                            />
+                          ) : (
+                            '-'
+                          )}
+                          <div className="etherscan-link">
+                            <a
+                              href={`https://etherscan.io/tx/${tx.tx_hash}`}
+                              target="_blank"
+                              rel="noopener noreferrer"
+                            >
+                              <img
+                                className=""
+                                src={assetRootPath(
+                                  '/images/link-icon-purple.svg'
+                                )}
+                              />
+                            </a>
+                          </div>
+                        </div>
                       </div>
-                    </div>
-                  </div>
-                )
-              })}
+                    )
+                  })}
+                </>
+              )}
+              {!overrideAccount && !active && (
+                <EmptyPlaceholder>
+                  <span className="connect-text">
+                    Connect your wallet to see your history
+                  </span>
+                  <GetOUSD
+                    className="py-2 px-4 max-w-107"
+                    gradient
+                    connect
+                    trackSource="Dapp widget body"
+                  />
+                </EmptyPlaceholder>
+              )}
             </div>
-            <div className="pagination d-flex justify-content-center justify-content-md-start">
-              {pageNumbers.map((pageNumber, index) => {
-                const isCurrent =
-                  pageNumber === historyPageQuery.data.page.current //currentPage
-                const skippedAPage =
-                  index > 0 && pageNumber - pageNumbers[index - 1] !== 1
-
-                return (
-                  <div className="d-flex" key={pageNumber}>
-                    {skippedAPage && (
-                      <div className="page-skip d-flex align-items-center justify-content-center">
-                        ...
+            {overrideAccount ||
+              (active && (
+                <div className="pagination d-flex justify-content-center justify-content-md-start">
+                  {pageNumbers.map((pageNumber, index) => {
+                    const isCurrent =
+                      pageNumber === historyPageQuery.data.page.current //currentPage
+                    const skippedAPage =
+                      index > 0 && pageNumber - pageNumbers[index - 1] !== 1
+
+                    return (
+                      <div className="d-flex" key={pageNumber}>
+                        {skippedAPage && (
+                          <div className="page-skip d-flex align-items-center justify-content-center">
+                            ...
+                          </div>
+                        )}
+                        <div
+                          className={`page-number ${
+                            isCurrent ? 'current' : ''
+                          } d-flex align-items-center justify-content-center`}
+                          onClick={() => {
+                            if (isCurrent) {
+                              return
+                            }
+                            setCurrentPage(pageNumber)
+                          }}
+                        >
+                          {pageNumber}
+                        </div>
                       </div>
-                    )}
-                    <div
-                      className={`page-number ${
-                        isCurrent ? 'current' : ''
-                      } d-flex align-items-center justify-content-center`}
-                      onClick={() => {
-                        if (isCurrent) {
-                          return
-                        }
-                        setCurrentPage(pageNumber)
-                      }}
-                    >
-                      {pageNumber}
-                    </div>
-                  </div>
-                )
-              })}
-            </div>
+                    )
+                  })}
+                </div>
+              ))}
           </>
         )}
       </div>
       <style jsx>{`
-        .oeth-balance {
+        .connect-text {
+          font-size: 14px;
+          line-height: 23px;
+          margin-bottom: 16px;
+          color: #828699;
         }
 
         .title-row {
@@ -558,6 +616,7 @@ const TransactionHistory = ({ isMobile }) => {
 
         .history-holder {
           background-color: #1e1f25;
+          border-radius: 0 0 8px 8px;
         }
 
         .grey-font {
@@ -667,10 +726,19 @@ const TransactionHistory = ({ isMobile }) => {
         }
 
         @media (max-width: 799px) {
+          .connect-text {
+            font-size: 12px;
+            line-height: 20px;
+          }
+
           .grey-font {
             font-size: 12px;
           }
 
+          .empty-placeholder {
+            height: 220px;
+          }
+
           .title-row {
             padding: 16px;
           }
@@ -726,6 +794,10 @@ const TransactionHistory = ({ isMobile }) => {
             font-size: 12px;
             margin-bottom: 20px;
           }
+
+          .history-holder {
+            border-radius: 0 0 4px 4px;
+          }
         }
       `}</style>
     </>

From e2988dbd23f6b16411f3f750ea77ce8cbe744042 Mon Sep 17 00:00:00 2001
From: Hrik Bhowal <hrik.bhowal@gmail.com>
Date: Mon, 5 Jun 2023 10:45:11 -0700
Subject: [PATCH 4/5] history route style fixes

---
 .../src/components/TransactionHistory.js      | 46 +++++++++++--------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/dapp-oeth/src/components/TransactionHistory.js b/dapp-oeth/src/components/TransactionHistory.js
index 258359b0ad..7a68179002 100644
--- a/dapp-oeth/src/components/TransactionHistory.js
+++ b/dapp-oeth/src/components/TransactionHistory.js
@@ -41,8 +41,7 @@ const FilterButton = ({
         <span className="status-circle"></span>
       </div>
       <style jsx>{`
-        .button,
-        .button.selected:hover {
+        .button {
           color: #828699;
           border-radius: 56px;
           margin-right: 10px;
@@ -57,10 +56,6 @@ const FilterButton = ({
           color: #edf2f5;
         }
 
-        .button:hover {
-          color: #edf2f5;
-        }
-
         .status-circle {
           width: 8px;
           height: 8px;
@@ -68,12 +63,7 @@ const FilterButton = ({
           background: #1e1f25;
         }
 
-        .button.selected:hover .status-circle {
-          background: #1e1f25;
-        }
-
-        .button.selected .status-circle,
-        .button:hover .status-circle {
+        .button.selected .status-circle {
           background: linear-gradient(90deg, #b361e6 -28.99%, #6a36fc 144.97%);
         }
 
@@ -372,7 +362,9 @@ const TransactionHistory = ({ isMobile }) => {
               </div>
               <div className="d-flex">
                 <div
-                  className="button d-flex align-items-center justify-content-center mb-auto"
+                  className={`button d-flex align-items-center justify-content-center mb-auto ${
+                    !overrideAccount && !active ? 'disabled' : ''
+                  }`}
                   onClick={() => {
                     historyQuery.refetch()
                   }}
@@ -435,7 +427,7 @@ const TransactionHistory = ({ isMobile }) => {
                             Date.parse(tx.time),
                             isMobile ? 'mm/dd/yy' : 'mm/dd/yyyy'
                           ) || ''}
-                          <div className="d-block d-md-none">
+                          <div className="type d-block d-md-none">
                             {txTypeMap[tx.type].name}
                           </div>
                         </div>
@@ -572,6 +564,11 @@ const TransactionHistory = ({ isMobile }) => {
         )}
       </div>
       <style jsx>{`
+        .disabled {
+          cursor: not-allowed !important;
+          color: #828699 !important;
+        }
+
         .connect-text {
           font-size: 14px;
           line-height: 23px;
@@ -645,8 +642,14 @@ const TransactionHistory = ({ isMobile }) => {
         }
 
         .etherscan-link {
-          display: inline;
-          margin-left: 10px;
+          position: absolute;
+          width: fit-content !important;
+          right: 0;
+          top: 0;
+        }
+
+        .etherscan-link a {
+          padding: 2px;
         }
 
         .filters {
@@ -757,9 +760,8 @@ const TransactionHistory = ({ isMobile }) => {
           }
 
           .etherscan-link {
-            position: absolute;
-            right: -4px;
-            top: 0;
+            min-width: 0 !important;
+            margin-left: 10px;
           }
 
           .page-skip {
@@ -783,6 +785,12 @@ const TransactionHistory = ({ isMobile }) => {
             padding: 16px;
             display: flex;
             justify-content: space-between;
+            align-items: center;
+            font-size: 12px;
+          }
+
+          .history-item .type {
+            font-size: 11px;
           }
 
           .history-item div {

From 5bb8c854a71ce2ae77d35713dbc8e5e459b4d68e Mon Sep 17 00:00:00 2001
From: Hrik Bhowal <hrik.bhowal@gmail.com>
Date: Mon, 5 Jun 2023 10:55:15 -0700
Subject: [PATCH 5/5] disable export button

---
 dapp-oeth/src/components/TransactionHistory.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dapp-oeth/src/components/TransactionHistory.js b/dapp-oeth/src/components/TransactionHistory.js
index 7a68179002..ea36b02386 100644
--- a/dapp-oeth/src/components/TransactionHistory.js
+++ b/dapp-oeth/src/components/TransactionHistory.js
@@ -366,7 +366,7 @@ const TransactionHistory = ({ isMobile }) => {
                     !overrideAccount && !active ? 'disabled' : ''
                   }`}
                   onClick={() => {
-                    historyQuery.refetch()
+                    !overrideAccount && !active ? null : historyQuery.refetch()
                   }}
                 >
                   {historyQuery.isLoading || historyQuery.isRefetching