fix(neuron-ui): fix the relationship between transaction price and speed

nervosnetwork · Sep 30, 2019 · 541ab94 · 541ab94
1 parent ca38b40
commit 541ab94
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 12 deletions.
diff --git a/packages/neuron-ui/src/components/TransactionFeePanel/index.tsx b/packages/neuron-ui/src/components/TransactionFeePanel/index.tsx
@@ -38,7 +38,7 @@ const TransactionFee: React.FunctionComponent<TransactionFee> = ({
   const selectedSpeed = calculateSpeed(+price)
 
   return (
-    <Stack tokens={{ childrenGap: 15 }}>
+    <Stack tokens={{ childrenGap: 15 }} aria-label="transaction fee">
       <Stack horizontal verticalAlign="end" horizontalAlign="space-between">
         <Stack horizontal tokens={{ childrenGap: 20 }} styles={{ root: { width: leftStackWidth } }}>
           <Stack.Item styles={{ root: { width: labelWidth } }}>
@@ -76,7 +76,7 @@ const TransactionFee: React.FunctionComponent<TransactionFee> = ({
             <Label>{t('send.price')}</Label>
           </Stack.Item>
           <Stack.Item grow>
-            <TextField value={price} onChange={onPriceChange} />
+            <TextField value={price} onChange={onPriceChange} aria-label="price" />
           </Stack.Item>
           {actionSpacer}
         </Stack>
@@ -90,10 +90,10 @@ const TransactionFee: React.FunctionComponent<TransactionFee> = ({
               dropdownWidth={140}
               selectedKey={selectedSpeed}
               options={[
-                { key: '0', text: 'immediately' },
-                { key: '30', text: '~ 30s' },
-                { key: '60', text: '~ 1min' },
-                { key: '180', text: '~ 3min' },
+                { key: '180', text: 'immediately' },
+                { key: '60', text: '~ 30s' },
+                { key: '30', text: '~ 1min' },
+                { key: '0', text: '~ 3min' },
               ]}
               onRenderCaretDown={() => {
                 return <Icon iconName="ArrowDown" />
@@ -103,6 +103,7 @@ const TransactionFee: React.FunctionComponent<TransactionFee> = ({
                   onPriceChange(e, item.key)
                 }
               }}
+              aria-label="expected speed"
             />
           </Stack.Item>
         </Stack>

diff --git a/packages/neuron-wallet/tests-e2e/tests/sendTransaction.ts b/packages/neuron-wallet/tests-e2e/tests/sendTransaction.ts
@@ -25,15 +25,15 @@ export default (app: Application) => {
     await app.waitUntilLoaded()
   })
 
-  afterEach(async() => {
+  afterEach(async () => {
     const { client } = app.spectron
     client.click('button[type=reset]')
     await client.waitUntilWindowLoaded()
   })
 
   describe('Test address field boundary validation', () => {
     app.test('Invalid address should show alert', async () => {
-    const { client } = app.spectron
+      const { client } = app.spectron
       const invalidAddress = 'invalid-address'
       const inputs = await app.elements('input')
       client.elementIdValue(inputs.value[0].ELEMENT, invalidAddress)
@@ -52,7 +52,6 @@ export default (app: Application) => {
       const errorMessage = await app.element('.ms-TextField-errorMessage')
       const msg = await client.elementIdText(errorMessage.value.ELEMENT)
       expect(msg.value).toBe('Address cannot be empty')
-
     })
 
     app.test('Valid address should not show alert', async () => {
@@ -66,8 +65,6 @@ export default (app: Application) => {
     })
   })
 
-
-
   describe('Test amount field boundary validation', () => {
     const validAddress = 'ckt1qyq0cwanfaf2t2cwmuxd8ujv2ww6kjv7n53sfwv2l0'
     app.test('Amount 60.99999999 is too small, 61 CKB is required', async () => {
@@ -110,5 +107,44 @@ export default (app: Application) => {
       expect(msg.value).toBe('Amount is not enough')
     })
   })
-}
 
+  describe('Test the transaction fee operations', () => {
+    beforeAll(async () => {
+      const { client } = app.spectron
+      client.click('button[role=switch]')
+      await app.waitUntilLoaded()
+    })
+
+    app.test('default price should be 0 and default speed should be 3min', async () => {
+      const { client } = app.spectron
+      const transactionFeePanel = client.$('div[aria-label="transaction fee"]')
+      const [, priceField] = await transactionFeePanel.$$('input')
+      expect((await client.elementIdAttribute(priceField.value.ELEMENT, 'value')).value).toBe('0')
+      const speedDropdown = await client.$('div[role=listbox]')
+      expect((await client.elementIdAttribute(speedDropdown.value.ELEMENT, 'innerText')).value).toBe('~ 3min')
+    })
+
+    app.test('Change speed to immediately and the price should be 180', async () => {
+      const { client } = app.spectron
+      client.click('div[role=listbox]')
+      await app.waitUntilLoaded()
+      client.click('button[title=immediately]')
+      await app.waitUntilLoaded()
+      const transactionFeePanel = client.$('div[aria-label="transaction fee"]')
+      const [, priceField] = await transactionFeePanel.$$('input')
+      expect((await client.elementIdAttribute(priceField.value.ELEMENT, 'value')).value).toBe('180')
+    })
+
+    app.test('Change the price to 150 and the speed should switch to ~ 30s', async () => {
+      const { client } = app.spectron
+      const transactionFeePanel = client.$('div[aria-label="transaction fee"]')
+      const [, priceField] = await transactionFeePanel.$$('input')
+      client.elementIdClear(priceField.value.ELEMENT)
+      await app.waitUntilLoaded()
+      client.elementIdValue(priceField.value.ELEMENT, '150')
+      const speedDropdown = await client.$('div[role=listbox]')
+
+      expect((await client.elementIdAttribute(speedDropdown.value.ELEMENT, 'innerText')).value).toBe('~ 30s')
+    })
+  })
+}