allow server provided monthly tip default choices (#723)

* allow server side to set monthly tip default choices

* patch subtext

* build Dockerfile with npm ci

Dockerfile

@@ -14,10 +14,10 @@ RUN apt-get update && apt-get install -y postgresql-client
 RUN mkdir -p /usr/src/app && mkdir /usr/src/app/bat-utils
 WORKDIR /usr/src/app
 
-RUN npm install -g npm@6.1
+RUN npm install -g npm@6.11.3
 
 COPY package.json package-lock.json /usr/src/app/
 COPY bat-utils/package.json /usr/src/app/bat-utils/
-RUN npm install
+RUN npm ci
 COPY . /usr/src/app
 RUN npm run build

ledger/controllers/wallet.js

@@ -23,6 +23,7 @@ const braveJoi = utils.extras.joi
 const braveUtils = utils.extras.utils
 
 const defaultTipChoices = (process.env.DEFAULT_TIP_CHOICES && process.env.DEFAULT_TIP_CHOICES.split(',')) || [1, 5, 10]
+const defaultMonthlyChoices = (process.env.DEFAULT_MONTHLY_CHOICES && process.env.DEFAULT_MONTHLY_CHOICES.split(',')) || [1, 5, 10]
 
 const v1 = {}
 const v2 = {}
@@ -75,7 +76,7 @@ const read = function (runtime, apiVersion) {
     result = underscore.extend(result, { addresses: wallet.addresses })
     if (runtime.registrars.persona) {
       const { payload } = runtime.registrars.persona
-      underscore.extend(payload, { defaultTipChoices })
+      underscore.extend(payload, { defaultTipChoices, defaultMonthlyChoices })
       result = underscore.extend(result, { parameters: payload || {} })
     }
 

package.json

@@ -109,6 +109,7 @@
     "rsmq": "^0.8.2",
     "rsmq-worker": "^0.5.2",
     "sdebug": "^0.9.5",
+    "subtext": "github:brave-intl/subtext#v5",
     "tldjs": "2.2.0",
     "tweetnacl": "^1.0.0",
     "underscore": "1.8.3",

test/ledger/wallet.integration.test.js

@@ -206,6 +206,7 @@ test('wallet endpoint returns default tip choices', async (t) => {
     body
   } = await ledgerAgent.get(`/v2/wallet/${paymentId}`).expect(ok)
   t.deepEqual(body.parameters.defaultTipChoices, [1, 5, 10])
+  t.deepEqual(body.parameters.defaultMonthlyChoices, [1, 5, 10])
 })
 
 function walletExpectation (day, wallets = 1) {