Merge pull request #6933 from willy-b/issue-6897

only display time range in statement PDF when range is available (#6896, #6897)
brave · Feb 16, 2017 · 8222db4 · 8222db4
2 parents 0d3dacf + a9e3f27
commit 8222db4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/js/about/contributionStatement.js b/js/about/contributionStatement.js
@@ -262,12 +262,19 @@ class ContributionStatement extends ImmutableComponent {
     return pages
   }
 
+  get contributionDateRangeString () {
+    if (this.lastContributionHumanFormattedDate !== '') {
+      return (this.lastContributionHumanFormattedDate + ' - ' + this.thisContributionHumanFormattedDate)
+    }
+    return null
+  }
+
   ContributionStatementDetailTable (page, pageIdx, totalPages) {
     return (
       <div className='contributionStatementDetailTableContainer'>
         <div>
           <span className='statementDatesCoveredText pull-right'>
-            { this.lastContributionHumanFormattedDate } - { this.thisContributionHumanFormattedDate }
+            { this.contributionDateRangeString }
           </span>
           <table className='contributionStatementDetailTable'>
             <tbody>

diff --git a/tools/lib/utilApp/index.js b/tools/lib/utilApp/index.js
@@ -54,7 +54,7 @@ app.on('ready', () => {
       cleanUserData(process.argv[3])
       break
     case 'addSimulatedLedgerTransactions':
-      addSimulatedLedgerTransactions(process.argv[3])
+      addSimulatedLedgerTransactions(parseInt(process.argv[3]))
       break
     case 'addSimulatedSynopsisVisits':
       addSimulatedSynopsisVisits(process.argv[3])

diff --git a/tools/utilAppRunner.js b/tools/utilAppRunner.js
@@ -14,7 +14,7 @@ function runUtilApp (cmd, file, stdioOptions) {
   }
   cmd = cmd.split(' ')
   if (process.env.NODE_ENV === 'development') {
-    cmd.push('--user-data-dir=brave-development')
+    cmd.push('--user-data-dir=../../../brave-development')
   }
   const utilApp = proc.spawnSync('electron', [utilAppDir].concat(cmd), options)
   if (utilApp.error) {