Display unclaimed balance and better detection of unclaimed (for PEOS)

greymass · Mar 3, 2019 · 7324c73 · 7324c73
1 parent 69e4d28
commit 7324c73
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/app/renderer/assets/locales/en-US/tools.json b/app/renderer/assets/locales/en-US/tools.json
@@ -4,6 +4,7 @@
   "tools_airgrab_anything_missing":  "Is an airdrop missing from this list? If so, let us know by dropping by the Greymass Wallet telegram channel: ",
   "tools_airgrabs_already_claimed": "Already Claimed",
   "tools_airgrabs_claim": "Claim",
+  "tools_airgrabs_unclaimed": "Unclaimed",
   "tools_airgrabs_header": "Airgrabs",
   "tools_airgrabs_message_warning": "This transaction will consume RAM.",
   "tools_airgrabs_no_match": "No airgrabs match these filters",

diff --git a/app/shared/components/Tools/Airgrabs.js b/app/shared/components/Tools/Airgrabs.js
@@ -165,13 +165,17 @@ class ToolsAirgrabs extends PureComponent<Props> {
               <Table.HeaderCell>
                 {t('tools_airgrabs_until')}
               </Table.HeaderCell>
+              <Table.HeaderCell textAlign="right">
+                {t('tools_airgrabs_unclaimed')}
+              </Table.HeaderCell>
               <Table.HeaderCell />
             </Table.Row>
           </Table.Header>
           <Table.Body>
             {filteredAirgrabs.map((airgrab) => {
               const airgrabAccounts = get(tables, `${airgrab.account}.${settings.account}.accounts.rows`) || [];
-              const claimed = airgrabAccounts.length > 0;
+              const unclaimedBalance = (airgrabAccounts && airgrabAccounts.length && airgrabAccounts[0].claimed === 0);
+              const claimed = (airgrabAccounts.length > 0 && !unclaimedBalance);
               return (
                 <Table.Row key={airgrab.symbol}>
                   <Table.Cell>
@@ -196,6 +200,15 @@ class ToolsAirgrabs extends PureComponent<Props> {
                     }
                   />
                   <Table.Cell
+                    collapsing
+                    content={unclaimedBalance ?
+                      airgrabAccounts[0].balance :
+                      '~'
+                    }
+                    textAlign="right"
+                  />
+                  <Table.Cell
+                    collapsing
                     textAlign="right"
                   >
                     <Button