From e05c5a656317cfd8bf71d79f57d18aef3a26993a Mon Sep 17 00:00:00 2001
From: CAPtheorem <79423264+CAPtheorem@users.noreply.github.com>
Date: Thu, 12 May 2022 16:25:54 -0700
Subject: [PATCH 1/2] twitter button

---
 .../src/containers/wallet/token/Token.js      |  58 +++++++++++++-----
 packages/boba/gateway/src/images/twitter.png  | Bin 0 -> 1514 bytes
 yarn.lock                                     |   8 +--
 3 files changed, 48 insertions(+), 18 deletions(-)
 create mode 100644 packages/boba/gateway/src/images/twitter.png

diff --git a/packages/boba/gateway/src/containers/wallet/token/Token.js b/packages/boba/gateway/src/containers/wallet/token/Token.js
index c98fd24c3f..eedecd6077 100644
--- a/packages/boba/gateway/src/containers/wallet/token/Token.js
+++ b/packages/boba/gateway/src/containers/wallet/token/Token.js
@@ -15,6 +15,8 @@ import { openAlert, openError } from 'actions/uiAction'
 import * as S from './Token.styles'
 import * as G from '../../Global.styles'
 
+import twitter from 'images/twitter.png'
+
 import { Box, Typography, CircularProgress, Input } from '@mui/material'
 import { tokenTableHeads } from './token.tableHeads'
 
@@ -58,15 +60,18 @@ function TokenPage() {
   const unorderedTransactions = useSelector(selectTransactions, isEqual)
   const orderedTransactions = orderBy(unorderedTransactions, i => i.timeStamp, 'desc')
 
-//BOBAB5DAD3D10
-
   let bobaTag = ''
   if(walletAddress)
     bobaTag = Md5.hashStr(walletAddress.toLowerCase().substring(2))
 
   let BT = ''
-  if (bobaTag)
+  let tweet = ''
+  if (bobaTag) {
     BT = "BOBA" + bobaTag.substring(0, 9).toUpperCase()
+    tweet = "https://twitter.com/intent/tweet?text=I%27m%20developing%20on%20Boba%20Network%20" + BT
+  }
+
+  console.log("tweet:",tweet)
 
   const pendingL1 = orderedTransactions.filter((i) => {
     if (i.chain === 'L1pending' && //use the custom API watcher for fast data on pending L1->L2 TXs
@@ -223,7 +228,8 @@ function TokenPage() {
       {layer === 'L2' && network === 'rinkeby' &&
           <G.LayerAlert style={{padding: '20px'}}>
           <Box>
-            <Box style={{ display: "inline-block" }}>
+
+            <Box style={{display: "inline-block"}}>
               <Typography variant="body2">
                 Developer Twitter/Turing test token fountain - your Boba Bubble:{" "}
                 <span style={{ opacity: 0.65 }}>{BT} <Copy value={BT} light={false} /></span>
@@ -231,17 +237,41 @@ function TokenPage() {
             </Box>
 
             <Typography variant="body3" sx={{ opacity: 0.65, marginBottom: "10px" }}>
-              Welcome to Boba! This is a special fountain for developers with empty wallets.  
-              To receive testnet BOBA and ETH, tweet your Boba Bubble and
-              paste the tweet link in the field below. 
-              You can get the link on Twitter by tapping the share icon, then tapping
-              "Share Tweet via", and finally selecting "Copy link to Tweet".
-              Your link should look something like this: https://twitter.com/name/status/1234567
+              Welcome developers.  
+              For testnet BOBA and ETH, tweet your Boba Bubble and
+              then paste the tweet link in the field below.
+            </Typography>
+
+            <a
+              target='_blank'
+              href={tweet}
+              aria-label="link"
+              style={{
+                backgroundColor: '#1b95e0',
+                color: '#fff',
+                borderRadius: '4px',
+                height: '28px',
+                fontWeight: '500',
+                fontSize: '13px',
+                lineheight: '26px',
+                padding: '8px 8px 8px 30px',
+                textDecoration: 'none',
+                backgroundImage: `url(${twitter})`,
+                backgroundRepeat: 'no-repeat',
+                backgroundSize: '16px 13px',
+                backgroundPosition: '8px 10px'
+              }}
+            >Tweet Now
+            </a>
+
+            <Typography variant="body3" sx={{ opacity: 0.65, marginTop: "10px", marginBottom: "10px" }}>
+              For the Tweet link, tap the share icon, tap "Share Tweet via", and finally select "Copy link to Tweet".
             </Typography>
 
             <Input
-              style = {{width: '80%'}}
+              style={{width: '80%'}}
               value={tweetUrl}
+              placeholder="Tweet Link"
               onChange={(e) => setTweetUrl(e?.target?.value.split('?')[0])} //remove the superfluous stuff after the "?"
             />
 
@@ -249,13 +279,13 @@ function TokenPage() {
               You are limited to one fountain call per twitter account per day. 
               The transaction will not show in your history since it's a MetaTransaction (the gas is covered by Boba). 
               If you already have some ETH in your wallet to cover gas you can use our 
-              <span
+              <a
                 target='_blank'
                 href={'https://faucets.boba.network/'}
                 aria-label="link"
-                style={{fontSize: '1.0em', opacity: '1.0', fontWeight: '700', paddingLeft: '3px', textDecoration: 'underline'}}
+                style={{color:'#fff', fontSize: '1.0em', opacity: '1.0', fontWeight: '700', paddingLeft: '3px', textDecoration: 'underline'}}
               >alternative faucet
-              </span>.
+              </a>.
             </Typography>
 
             <Button
diff --git a/packages/boba/gateway/src/images/twitter.png b/packages/boba/gateway/src/images/twitter.png
new file mode 100644
index 0000000000000000000000000000000000000000..992d33cb0506b007a3707440988eb0ee1273ca7f
GIT binary patch
literal 1514
zcmV<G1r_><P)<h;3K|Lk000e1NJLTq001li001Ni1^@s6^4HjG000HCNkl<ZSVz5B
zYp7L46#l;1YF73j3lmI<3bF{vr0bs|rI%&ipeQ6OjI!sC>;(l8L{BN{Mg9;X%0eoH
z)JTeuvJeExZcwCFkVz3_8D+lqe6gmP!`$t;=k9&Z#eoC&o-?!NTWfu5&0347EJ-A(
z>i6CJZ?XV5lBJ|00bDO>E`T!u90g#vqygvLDw6Np9g;=?@OIArwX^a2<4Eo{fni1A
zFtC#B5<ArO$`zNiK+=-{CU+3Hh2*^?Kh5_@n(V!Q$~m`|<Vr&qz)6}RX{mGW!l*!z
zv}=kw2V0iqGLm;h8Npfr%ux0*PueGVBK$xu2Cxdioahbn$e$!9klb&8N0B^OmgTb~
z9|Ew(IX5r4$A0Sqa8R}^%jZbm58wcRB7qu0o+)E{!qriU|Ft78Ao+RtJ6XefzZt;v
zc;I7_mq*KwCTSPeT9N`-Nta0a2!H`G>$T|DK~S=|?KevPOY&Nh>m;2IV0;iF>1avc
z1DF6{KY%d+21s5>^5+x?b$Fc_U?YH;5pc3x9i@|XEtZx$=eA3_8Ni7oXC=VLN5CgU
zcNh&u1NfWdLXz)A#q7IsDBxK<Op~;w>e@PJvpp$OBwEZMxj6wIBWWvuDOpM}(3WD%
z1MfKJ9w50RaXW(Xc?wMNAn8s?uL5YvXb9G}C%}71UQBYMq|wIVz&Y>zIslhdTxf^P
zMds3dl3sMqy+m?n0ubqv0>xzQFUxWX$p?D?oWO1;IgjMG0W5i-l_fH(Sb&-9^Oaj_
zucUXKb8i6HKyqKzdSzKIjp?ad3x{(gZzB1oq_HIT4$2ae#!1=+;N&3!#Vl<RA7~QS
z4oROm=QaTN3cyaIjimb|J>P?c6W~Q8mnW*V0LNTsQ8{1I+Y!v5T$q7Oz%BKJWS^})
z0Dg-~P3j@&65s_S-x>rs2GKEQS(4i%-6QGcnwJ^Z(i3hx&vWfi3fGCh@Q9F{6LWCu
z)lFGqlBBOACs#_k4nTiR&^dtosjc%+bOcXw8p(mYwn>1Cn1?N`rHBtqsbh{2-jh7@
z2g%b(?#gSEyp~u&@&*7Fjbld`L=$nTrr6}1>#LT#tvoDgwxmybi0meyI_(VsC+UTv
zC>G}d*K&E{i1&UC04wKGJuy-sn#f53cLm80)5DeoBo3#Vczg`Li4n9tAcvF3iNC)_
z{{C|aB@*(iESw@~J%Ce($;VBsR(Efr!?L0%?yAz^kSvgID9iE*lDAt~SNFCN*cU8J
zayrQ`+qG(kxZ8>h0OtYt1;9CytYw+qMNV#tKh+%{IOpb8xjTr%Ra$uOt^U2HW^2<F
z*iidJg+{WE<fgiSQ}CT8Y5QU1aHtR^y<QZ>!gkzkYvJ(3#imr!-I8936`K9jq|Iq!
z^;G-rB6&u9*@hf5v`txA#&}fH<MH;?J-4gUngFcsO?mff8>V!!ZpT_7>(BbF(}?X;
zFTmQJO;mWMD2j)N1KSaBq(^GmEpyEG-dh)K1-^{~#`Tyv!fR^%Vo?+}!V2CVZcNtk
z6^lZSuzoHHiuJN}6E+IyrslOXsViUWoVzL-r`C8Z3{oncLsG&z;?{gk(kw|&1L*4^
zd$fisl2#N&abpv(btrKXfJ-Ia3gDs$w8<o=mEtq2n%f^CY06txs%6<$T9b4ZfO7%-
z6@^ap-cKcIubq94jhpk9zi#l^8B;KI;af@GLh=g(8po-PM!QA{>*sEh^jHQi2V{IR
zn$*d|sYNoN`5Bu&E&*TzN1K#}0c2gR^L_bz*n-GjnMK)9Fn8&2^Wt^`zaL1x2EazH
zyYkG_4cHcks~St1>AmkKX+_Ue0Oo}{%i4VFylqyo8o>H&f^PE+o69w#K=sn<1m5!Q
zAXiB`1;E)h=J(!PlWJ2$8~+=f4B+q1xt{=h2jCl$KjxRj>hEB$K$Fb>0N+_Vz)As-
QfB*mh07*qoM6N<$g28~*vH$=8

literal 0
HcmV?d00001

diff --git a/yarn.lock b/yarn.lock
index c3507aef8f..4eee977487 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -20592,10 +20592,10 @@ sass-loader@8.0.2:
     schema-utils "^2.6.1"
     semver "^6.3.0"
 
-sass@^1.49.7:
-  version "1.49.7"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.7.tgz#22a86a50552b9b11f71404dfad1b9ff44c6b0c49"
-  integrity sha512-13dml55EMIR2rS4d/RDHHP0sXMY3+30e1TKsyXaSz3iLWVoDWEoboY8WzJd5JMnxrRHffKO3wq2mpJ0jxRJiEQ==
+sass@^1.51.0:
+  version "1.51.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.51.0.tgz#25ea36cf819581fe1fe8329e8c3a4eaaf70d2845"
+  integrity sha512-haGdpTgywJTvHC2b91GSq+clTKGbtkkZmVAb82jZQN/wTy6qs8DdFm2lhEQbEwrY0QDRgSQ3xDurqM977C3noA==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"

From 3b4214ce7a57e83c8b16e798156e04ee9344e448 Mon Sep 17 00:00:00 2001
From: CAPtheorem <79423264+CAPtheorem@users.noreply.github.com>
Date: Fri, 13 May 2022 09:57:04 -0700
Subject: [PATCH 2/2] final cleanup

---
 packages/boba/gateway/package.json            |  4 +-
 .../bobaScope/Transactions.module.scss        |  6 +-
 .../gateway/src/containers/monster/Monster.js | 64 +------------------
 .../src/containers/wallet/token/Token.js      |  2 -
 4 files changed, 6 insertions(+), 70 deletions(-)

diff --git a/packages/boba/gateway/package.json b/packages/boba/gateway/package.json
index 663137f987..67981a6892 100644
--- a/packages/boba/gateway/package.json
+++ b/packages/boba/gateway/package.json
@@ -53,6 +53,7 @@
     "react-select": "^5.2.2",
     "redux": "^4.1.2",
     "redux-thunk": "^2.3.0",
+    "sass": "^1.51.0",
     "serve": "^11.3.2",
     "truncate-middle": "^1.0.6",
     "ts-md5": "^1.2.11",
@@ -75,7 +76,6 @@
   },
   "devDependencies": {
     "@beam-australia/react-env": "2.1.2",
-    "audit-ci": "^3.1.1",
-    "sass": "^1.49.7"
+    "audit-ci": "^3.1.1"
   }
 }
diff --git a/packages/boba/gateway/src/containers/bobaScope/Transactions.module.scss b/packages/boba/gateway/src/containers/bobaScope/Transactions.module.scss
index 8049f54571..2091ac878b 100644
--- a/packages/boba/gateway/src/containers/bobaScope/Transactions.module.scss
+++ b/packages/boba/gateway/src/containers/bobaScope/Transactions.module.scss
@@ -54,11 +54,8 @@
 }
 
 .transactions {
-  /*height: 100%;*/
   overflow: auto;
-  background: $background400; //white;
-  // border-bottom: 1px solid rgb(233, 234, 235);
-  // box-shadow: rgb(100 100 111 / 20%) 0px 7px 10px 0px;
+  background: $background400;
   border-radius: 8px;
   margin-top: 10px;
   min-height: 100px;
@@ -75,7 +72,6 @@
   flex-direction: row;
   align-items: center;
   justify-content: space-between;
-
   margin-bottom: 32px;
   span {
     margin-right: 20px;
diff --git a/packages/boba/gateway/src/containers/monster/Monster.js b/packages/boba/gateway/src/containers/monster/Monster.js
index a132100093..5fe4b0bc5e 100644
--- a/packages/boba/gateway/src/containers/monster/Monster.js
+++ b/packages/boba/gateway/src/containers/monster/Monster.js
@@ -21,7 +21,7 @@ class Monster extends React.Component {
 
   constructor(props) {
 
-    super(props);
+    super(props)
 
     const {
       list,
@@ -113,33 +113,6 @@ class Monster extends React.Component {
     await networkService.addNFT(this.state.contractAddress, this.state.tokenID);
   }
 
-  async claimAuthenticatedFaucetTokens() {
-    try {
-      this.setState({...this.state, isClaimFaucetLoading: true})
-      const tweetId = this.state.tweetUrl?.match(/twitter\.com\/.*\/status\/(\d+)/)[1]
-
-      const {dispatch} = this.props
-      const res = await networkService.getTestnetETHAuthenticatedMetaTransaction(tweetId)
-      if (!res) {
-        dispatch(openAlert('Faucet request submitted'))
-      } else {
-        this.setState({...this.state, faucetErrorMsg: res})
-      }
-    } catch (err) {
-      let error = err.message.match(/execution reverted: (.*)\\+"}}/)
-      if (error) {
-        error = error[1]
-      } else {
-        error = err?.message ?? err;
-      }
-      console.error(error);
-      this.setState({...this.state, faucetErrorMsg: error})
-
-    } finally {
-      this.setState({...this.state, isClaimFaucetLoading: false})
-    }
-  }
-
   render() {
 
     const {
@@ -294,41 +267,10 @@ class Monster extends React.Component {
                   also, to support content creators, journalists, artists, and developers. When they use their
                   Boba Bubble on social media and in their art, you will be able to send BOBA and ETH to
                   their Boba wallet. The system is powered by Turing, which does all
-                  the heavy lifting in the background.
-                </Typography>
-
-                <Typography variant='body2' sx={{ opacity: 0.95 }}>
-                  Developer Twitter/Turing test token fountain
-                </Typography>
-
-                <Typography variant="body3" sx={{ opacity: 0.65, marginBottom: "10px" }}>
-                  To receive testnet BOBA and ETH for developing on Boba rinkeby, tweet your Boba Bubble and
-                  paste the tweet link here. You can get the link on Twitter by tapping the share icon, then tapping
-                  "Share Tweet via", and finally selecting "Copy link to Tweet".
-                  Your link should look something like this: https://twitter.com/name/status/1234567
+                  the heavy lifting in the background. The new Twitter/Turing based fountain has been lauched and is availible 
+                  to developers on Rinkeby. 
                 </Typography>
 
-                <Input
-                  value={tweetUrl}
-                  onChange={(e) => this.setState({
-                      ...this.state,
-                      tweetUrl: e?.target?.value.split('?')[0] //remove the superfluous stuff after the "?"
-                    })
-                  }
-                />
-
-                <Button
-                  type="primary"
-                  variant="contained"
-                  style={{ marginTop: "10px", marginBottom: "18px" }}
-                  disabled={!this.state.tweetUrl || !this.state.tweetUrl?.includes('http')}
-                  loading={this.state.isClaimFaucetLoading}
-                  onClick={async (e) => {await this.claimAuthenticatedFaucetTokens()}}
-                  size="small">
-                  Authenticated Faucet
-                </Button>
-                {this.state.faucetErrorMsg ? <Typography style={{color: 'red'}}>{this.state.faucetErrorMsg}</Typography> : null}
-
               </Box>
             </S.NFTListContainer>
           </S.NFTPageContainer>
diff --git a/packages/boba/gateway/src/containers/wallet/token/Token.js b/packages/boba/gateway/src/containers/wallet/token/Token.js
index eedecd6077..f214f45622 100644
--- a/packages/boba/gateway/src/containers/wallet/token/Token.js
+++ b/packages/boba/gateway/src/containers/wallet/token/Token.js
@@ -71,8 +71,6 @@ function TokenPage() {
     tweet = "https://twitter.com/intent/tweet?text=I%27m%20developing%20on%20Boba%20Network%20" + BT
   }
 
-  console.log("tweet:",tweet)
-
   const pendingL1 = orderedTransactions.filter((i) => {
     if (i.chain === 'L1pending' && //use the custom API watcher for fast data on pending L1->L2 TXs
       i.crossDomainMessage &&