Adjust treasury.tips to tips module (#259)

* Adjust treasury.tips to tips module * update darwinia.js
darwinia-network · Aug 23, 2021 · b19ce3d · b19ce3d
1 parent 0473a94
commit b19ce3d
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 37 deletions.
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "@polkadot/wasm-crypto": "^1.4.1",
     "babel-core": "^7.0.0-bridge.0",
     "typescript": "^3.8.3",
-    "@darwinia/types": "1.1.6"
+    "@darwinia/types": "1.1.7"
   },
   "scripts": {
     "analyze": "yarn run build && cd packages/apps && yarn run source-map-explorer build/main.*.js",

diff --git a/packages/metadata/package.json b/packages/metadata/package.json
@@ -27,7 +27,7 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/type-metadata#readme",
   "dependencies": {
     "@babel/runtime": "^7.11.2",
-    "@darwinia/types-known": "1.1.6",
+    "@darwinia/types-known": "1.1.7",
     "@polkadot/types": "1.35.0-beta.19",
     "@polkadot/util": "^3.5.1",
     "@polkadot/util-crypto": "^3.5.1",

diff --git a/packages/page-settings/package.json b/packages/page-settings/package.json
@@ -12,7 +12,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.9.6",
-    "@darwinia/types-known": "1.1.6",
+    "@darwinia/types-known": "1.1.7",
     "@polkadot/apps-config": "0.42.0-beta.100",
     "@polkadot/react-components": "0.42.0-beta.100",
     "@polkadot/react-query": "0.42.0-beta.100",

diff --git a/packages/page-staking-darwinia/package.json b/packages/page-staking-darwinia/package.json
@@ -12,7 +12,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.9.6",
-    "@darwinia/types": "1.1.6",
+    "@darwinia/types": "1.1.7",
     "@polkadot/app-explorer": "0.42.0-beta.100",
     "@polkadot/react-components-darwinia": "0.42.0-beta.100",
     "@polkadot/react-query": "0.42.0-beta.100"

diff --git a/packages/page-treasury/src/Overview/ProposalCreate.tsx b/packages/page-treasury/src/Overview/ProposalCreate.tsx
@@ -22,8 +22,7 @@ function Propose ({ className }: Props): React.ReactElement<Props> | null {
   const [beneficiary, setBeneficiary] = useState<string | null>(null);
   const [isOpen, toggleOpen] = useToggle();
   const [ringValue, setRingValue] = useState<BN | undefined>();
-  const [ktonValue, setKtonValue] = useState<BN | undefined>();
-  const hasValue = ringValue?.gtn(0) || ktonValue?.gtn(0);
+  const hasValue = ringValue?.gtn(0);
   const bondPercentage = useMemo(
     () => `${api.consts.treasury.proposalBond.muln(100).divn(1_000_000).toNumber().toFixed(2)}%`,
     [api]
@@ -76,22 +75,14 @@ function Propose ({ className }: Props): React.ReactElement<Props> | null {
                   label={t('ring')}
                   onChange={setRingValue}
                 />
-                <InputBalance
-                  currencyType={'kton'}
-                  help={t('The amount of KTON that will be allocated from the treasury pot')}
-                  isError={!hasValue}
-                  isZeroable
-                  label={t('kton')}
-                  onChange={setKtonValue}
-                />
                 <Static
                   help={t('The on-chain percentage for the treasury')}
                   label={t('proposal bond')}
                 >
                   {bondPercentage}
                 </Static>
                 <InputBalance
-                  defaultValue={api.consts.treasury.ringProposalBondMinimum.toString()}
+                  defaultValue={api.consts.treasury.proposalBondMinimum.toString()}
                   help={t('The minimum amount that will be bonded')}
                   isDisabled
                   label={t('minimum bond')}
@@ -111,7 +102,7 @@ function Propose ({ className }: Props): React.ReactElement<Props> | null {
               isPrimary
               label={t('Submit proposal')}
               onStart={toggleOpen}
-              params={[ringValue, ktonValue, beneficiary]}
+              params={[ringValue, beneficiary]}
               tx='treasury.proposeSpend'
             />
           </Modal.Actions>

diff --git a/packages/page-treasury/src/Overview/Tip.tsx b/packages/page-treasury/src/Overview/Tip.tsx
@@ -148,7 +148,7 @@ function Tip ({ bestNumber, className = '', defaultId, hash, isMember, members,
               isDisabled={!isFinder}
               label={t('Cancel')}
               params={[hash]}
-              tx='treasury.retractTip'
+              tx='tips.retractTip'
             />
           )
         }

diff --git a/packages/page-treasury/src/Overview/TipClose.tsx b/packages/page-treasury/src/Overview/TipClose.tsx
@@ -56,7 +56,7 @@ function TipClose ({ hash, isMember, members }: Props): React.ReactElement<Props
               isDisabled={!accountId}
               onStart={toggleOpen}
               params={[hash]}
-              tx='treasury.closeTip'
+              tx='tips.closeTip'
             />
           </Modal.Actions>
         </Modal>

diff --git a/packages/page-treasury/src/Overview/TipCreate.tsx b/packages/page-treasury/src/Overview/TipCreate.tsx
@@ -123,8 +123,8 @@ function TipCreate ({ members, refresh }: Props): React.ReactElement<Props> {
               }
               tx={
                 isMember
-                  ? 'treasury.tipNew'
-                  : 'treasury.reportAwesome'
+                  ? 'tips.tipNew'
+                  : 'tips.reportAwesome'
               }
             />
           </Modal.Actions>

diff --git a/packages/page-treasury/src/Overview/TipEndorse.tsx b/packages/page-treasury/src/Overview/TipEndorse.tsx
@@ -39,7 +39,7 @@ function TipEndorse ({ defaultId, hash, isMember, isTipped, median, members }: P
         isDisabled={!isMember || !isTipped}
         isIcon
         params={[hash, median]}
-        tx='treasury.tip'
+        tx='tips.tip'
         withoutLink
       />
       {isOpen && (
@@ -88,7 +88,7 @@ function TipEndorse ({ defaultId, hash, isMember, isTipped, median, members }: P
               label={t<string>('Submit tip')}
               onStart={toggleOpen}
               params={[hash, value]}
-              tx='treasury.tip'
+              tx='tips.tip'
             />
           </Modal.Actions>
         </Modal>

diff --git a/packages/page-treasury/src/Overview/index.tsx b/packages/page-treasury/src/Overview/index.tsx
@@ -45,7 +45,7 @@ function Overview ({ className }: Props): React.ReactElement<Props> {
 
       const available = Object
         .entries(quickTips)
-        .map(([hash, value]) => value ? api.tx.treasury.tip(hash, value) : null)
+        .map(([hash, value]) => value ? (api.tx.tips || api.tx.treasury).tip(hash, value) : null)
         .filter((value): value is SubmittableExtrinsic<'promise'> => !!value);
 
       return {

diff --git a/packages/react-api/package.json b/packages/react-api/package.json
@@ -31,7 +31,7 @@
   "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme",
   "dependencies": {
     "@babel/runtime": "^7.9.6",
-    "@darwinia/types-known": "1.1.6",
+    "@darwinia/types-known": "1.1.7",
     "@polkadot/api": "1.35.0-beta.19",
     "@polkadot/extension-dapp": "^0.25.0-beta.4",
     "rxjs-compat": "^6.6.2"

diff --git a/yarn.lock b/yarn.lock
@@ -1408,24 +1408,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@darwinia/types-known@npm:1.1.6, @darwinia/types-known@npm:^1.1.6":
-  version: 1.1.6
-  resolution: "@darwinia/types-known@npm:1.1.6"
+"@darwinia/types-known@npm:1.1.7, @darwinia/types-known@npm:^1.1.7":
+  version: 1.1.7
+  resolution: "@darwinia/types-known@npm:1.1.7"
   dependencies:
     "@babel/runtime": ^7.9.6
     "@polkadot/types": 4.0.4-5
     "@polkadot/util": 6.0.5
     bn.js: ^5.1.2
-  checksum: c7eebc22392091450656c28b9ba188643094ffc637ae951421f002656b0e7560be7951621092c9040635dfb8281d923e5373e2cb88858f4fd8a43f55416b6def
+  checksum: 8baadaebfd6c7928df27f58febd743c03d5200582a3fc80bb98351712d2b647cc6c7a3e3ad5ea6613769b2ee7aef5088cb30bbed3666a9b7b4716c244477acdb
   languageName: node
   linkType: hard
 
-"@darwinia/types@npm:1.1.6":
-  version: 1.1.6
-  resolution: "@darwinia/types@npm:1.1.6"
+"@darwinia/types@npm:1.1.7":
+  version: 1.1.7
+  resolution: "@darwinia/types@npm:1.1.7"
   dependencies:
-    "@darwinia/types-known": ^1.1.6
-  checksum: 11dc4d1bc97990feeacd26cef6f18f27b56030b473595166764a82c22fcc9e21aed2e2a3ef80f5701fa35e5b874c7c04e9d3f0b29ebc9d9721260161bc052ac5
+    "@darwinia/types-known": ^1.1.7
+  checksum: 25a4da0d8a836fd4d5e2c5d128d11675f348fe8a8ab7e93d0873b3ddac66e9bf499bd6c40545beabe4e475a10e56056d708f3fc08e37158acd8f96d7d3efad9f
   languageName: node
   linkType: hard
 
@@ -3264,7 +3264,7 @@ __metadata:
   resolution: "@polkadot/app-settings@workspace:packages/page-settings"
   dependencies:
     "@babel/runtime": ^7.9.6
-    "@darwinia/types-known": 1.1.6
+    "@darwinia/types-known": 1.1.7
     "@polkadot/apps-config": 0.42.0-beta.100
     "@polkadot/react-components": 0.42.0-beta.100
     "@polkadot/react-query": 0.42.0-beta.100
@@ -3286,7 +3286,7 @@ __metadata:
   resolution: "@polkadot/app-staking-darwinia@workspace:packages/page-staking-darwinia"
   dependencies:
     "@babel/runtime": ^7.9.6
-    "@darwinia/types": 1.1.6
+    "@darwinia/types": 1.1.7
     "@polkadot/app-explorer": 0.42.0-beta.100
     "@polkadot/react-components-darwinia": 0.42.0-beta.100
     "@polkadot/react-query": 0.42.0-beta.100
@@ -3535,7 +3535,7 @@ __metadata:
   resolution: "@polkadot/metadata@workspace:packages/metadata"
   dependencies:
     "@babel/runtime": ^7.11.2
-    "@darwinia/types-known": 1.1.6
+    "@darwinia/types-known": 1.1.7
     "@polkadot/keyring": ^3.5.1
     "@polkadot/types": 1.35.0-beta.19
     "@polkadot/util": ^3.5.1
@@ -3549,7 +3549,7 @@ __metadata:
   resolution: "@polkadot/react-api@workspace:packages/react-api"
   dependencies:
     "@babel/runtime": ^7.9.6
-    "@darwinia/types-known": 1.1.6
+    "@darwinia/types-known": 1.1.7
     "@polkadot/api": 1.35.0-beta.19
     "@polkadot/extension-dapp": ^0.25.0-beta.4
     rxjs-compat: ^6.6.2