From 139afb47a5c74bf573a6821f11477ea0614d5ed3 Mon Sep 17 00:00:00 2001
From: Reckless_Satoshi <reckless.satoshi@protonmail.com>
Date: Mon, 20 Jun 2022 11:48:42 -0700
Subject: [PATCH] Add .dockerignore. Fix profile button tooltip.

---
 .dockerignore                          | 12 ++++++++++++
 frontend/src/components/BottomBar.js   |  4 ++--
 frontend/src/components/UserGenPage.js | 13 +++++++++----
 3 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..1f536054
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,12 @@
+db
+docs
+docker
+.editorconfig
+.env-sample
+CONTRIBUTING.md
+django
+README.md
+setup.md
+docker-compose.yml
+.github
+.git
\ No newline at end of file
diff --git a/frontend/src/components/BottomBar.js b/frontend/src/components/BottomBar.js
index e24dd407..2cf5a0d5 100644
--- a/frontend/src/components/BottomBar.js
+++ b/frontend/src/components/BottomBar.js
@@ -140,7 +140,7 @@ bottomBarDesktop =()=>{
                         <div style={{display: this.showProfileButton() ? '':'none'}}>
                         <ListItemButton onClick={this.handleClickOpenProfile} >
                             <Tooltip
-                                open={hasRewards || hasOrder}
+                                open={(hasRewards || hasOrder) && this.showProfileButton()}
                                 title={(hasRewards ? t("You can claim satoshis!")+" ": "" )+
                                     (hasOrder ? t("You have an active order"):"")}
                                 >
@@ -333,7 +333,7 @@ bottomBarPhone =()=>{
 
                     <Grid item xs={1.6}>
                     <div style={{display: this.showProfileButton() ? '':'none'}}>
-                    <Tooltip open={hasRewards || hasOrder}
+                    <Tooltip open={(hasRewards || hasOrder) && this.showProfileButton()}
                             title={(hasRewards ? t("You can claim satoshis!")+" ": "" )+
                                 (hasOrder ? t("You have an active order"):"")}>
                         <IconButton onClick={this.handleClickOpenProfile} sx={{margin: 0, bottom: 17, right: 8}} >
diff --git a/frontend/src/components/UserGenPage.js b/frontend/src/components/UserGenPage.js
index 47e30cbc..39c736f7 100644
--- a/frontend/src/components/UserGenPage.js
+++ b/frontend/src/components/UserGenPage.js
@@ -38,7 +38,7 @@ class UserGenPage extends Component {
       this.setState({
         nickname: this.props.nickname,
         token: this.props.token? this.props.token : "",
-        avatar_url: '/static/assets/avatars/' + this.props.nickname + '.png',
+        avatarUrl: '/static/assets/avatars/' + this.props.nickname + '.png',
         loadingRobot: false
       });
     }
@@ -81,7 +81,7 @@ class UserGenPage extends Component {
           this.setState({
               nickname: data.nickname,
               bit_entropy: data.token_bits_entropy,
-              avatar_url: '/static/assets/avatars/' + data.nickname + '.png',
+              avatarUrl: '/static/assets/avatars/' + data.nickname + '.png',
               shannon_entropy: data.token_shannon_entropy,
               bad_request: data.bad_request,
               found: data.found,
@@ -146,7 +146,12 @@ class UserGenPage extends Component {
     this.delGeneratedUser();
     this.getGeneratedUser(this.state.token);
     this.setState({loadingRobot: true, tokenHasChanged: false});
-    this.props.setAppState({avatarLoaded: false, nickname: null, token: null, copiedToken: false});
+    this.props.setAppState({avatarLoaded: false, 
+      nickname: null, 
+      token: null, 
+      copiedToken: false, 
+      lastOrderId: null,
+      activeOrderId: null});
   }
 
   handleClickOpenInfo = () => {
@@ -194,7 +199,7 @@ class UserGenPage extends Component {
                     disableError={true}
                     cover={true}
                     color='null'
-                    src={getCookie("sessionid") ? this.state.avatar_url || "" : ""}
+                    src={getCookie("sessionid") ? this.state.avatarUrl || "" : ""}
                   />
                 </div>
                 </Tooltip><br/>