Refactor json structure and move some from group into core

src/components/Apps/AppPublish.tsx

@@ -178,7 +178,7 @@ export const AppPublish = ({ names, categories }) => {
       const fee = await getFee('ARBITRARY');
 
       await show({
-        message: t('core:save_options.publish_app', {
+        message: t('core:question.publish_app', {
           postProcess: 'capitalizeFirst',
         }),
         publishFee: fee.fee + ' QORT',

src/components/Apps/AppRating.tsx

@@ -113,7 +113,7 @@ export const AppRating = ({ app, myName, ratingCountPosition = 'right' }) => {
       const fee = await getFee('CREATE_POLL');
 
       await show({
-        message: t('core:message.error.generic', {
+        message: t('core:question.rate_app', {
           rate: newValue,
           postProcess: 'capitalizeFirst',
         }),

src/components/Apps/AppsPrivate.tsx

@@ -192,7 +192,7 @@ export const AppsPrivate = ({ myName }) => {
       const fee = await getFee('ARBITRARY');
 
       await show({
-        message: t('core:save_options.publish_app', {
+        message: t('core:question.publish_app', {
           postProcess: 'capitalizeFirst',
         }),
         publishFee: fee.fee + ' QORT',

src/components/Chat/GroupAnnouncements.tsx

@@ -289,7 +289,7 @@ export const GroupAnnouncements = ({
       const fee = await getFee('ARBITRARY');
 
       await show({
-        message: t('group:question.perform_transaction', {
+        message: t('core:question.perform_transaction', {
           action: 'ARBITRARY',
           postProcess: 'capitalizeFirst',
         }),

src/components/GlobalActions/JoinGroup.tsx

@@ -70,7 +70,7 @@ export const JoinGroup = () => {
       const fee = await getFee('JOIN_GROUP');
 
       await show({
-        message: t('group:question.perform_transaction', {
+        message: t('core:question.perform_transaction', {
           action: 'JOIN_GROUP',
           postProcess: 'capitalizeFirst',
         }),

src/components/Group/AddGroup.tsx

@@ -118,7 +118,7 @@ export const AddGroup = ({ address, open, setOpen }) => {
       const fee = await getFee('CREATE_GROUP');
 
       await show({
-        message: t('group:question.perform_transaction', {
+        message: t('core:question.perform_transaction', {
           action: 'CREATE_GROUP',
           postProcess: 'capitalizeFirst',
         }),

src/components/Group/AddGroupList.tsx

@@ -113,7 +113,7 @@ export const AddGroupList = ({ setInfoSnack, setOpenSnack }) => {
       const fee = await getFee('JOIN_GROUP');
 
       await show({
-        message: t('group:question.perform_transaction', {
+        message: t('core:question.perform_transaction', {
           action: 'JOIN_GROUP',
           postProcess: 'capitalizeFirst',
         }),

src/components/Group/Forum/NewThread.tsx

@@ -182,7 +182,7 @@ export const NewThread = ({
       const missingFields: string[] = [];
 
       if (!isMessage && !threadTitle) {
-        errorMsg = t('group:question.provide_thread', {
+        errorMsg = t('core:question.provide_thread', {
           postProcess: 'capitalizeFirst',
         });
       }
@@ -229,7 +229,7 @@ export const NewThread = ({
         feeToShow = +feeToShow * 2;
       }
       await show({
-        message: t('group:question.perform_transaction', {
+        message: t('core:question.perform_transaction', {
           action: 'ARBITRARY',
           postProcess: 'capitalizeFirst',
         }),

src/components/Group/InviteMember.tsx

@@ -17,7 +17,7 @@ export const InviteMember = ({ groupId, setInfoSnack, setOpenSnack, show }) => {
       const fee = await getFee('GROUP_INVITE');
 
       await show({
-        message: t('group:question.perform_transaction', {
+        message: t('core:question.perform_transaction', {
           action: 'GROUP_INVITE',
           postProcess: 'capitalizeFirst',
         }),

src/components/Group/ListOfBans.tsx

@@ -88,7 +88,7 @@ export const ListOfBans = ({ groupId, setInfoSnack, setOpenSnack, show }) => {
     try {
       const fee = await getFee('CANCEL_GROUP_BAN');
       await show({
-        message: t('group:question.perform_transaction', {
+        message: t('core:question.perform_transaction', {
           action: 'CANCEL_GROUP_BAN',
           postProcess: 'capitalizeFirst',
         }),

src/components/Group/ListOfGroupPromotions.tsx

@@ -276,7 +276,7 @@ export const ListOfGroupPromotions = () => {
       const groupId = group.groupId;
       const fee = await getFee('JOIN_GROUP');
       await show({
-        message: t('group:question.perform_transaction', {
+        message: t('core:question.perform_transaction', {
           action: 'JOIN_GROUP',
           postProcess: 'capitalizeFirst',
         }),

src/components/Group/ListOfInvites.tsx

@@ -94,7 +94,7 @@ export const ListOfInvites = ({
       const fee = await getFee('CANCEL_GROUP_INVITE');
 
       await show({
-        message: t('group:question.perform_transaction', {
+        message: t('core:question.perform_transaction', {
           action: 'CANCEL_GROUP_INVITE',
           postProcess: 'capitalizeFirst',
         }),

src/components/Group/ListOfJoinRequests.tsx

@@ -97,7 +97,7 @@ export const ListOfJoinRequests = ({
       const fee = await getFee('GROUP_INVITE');
 
       await show({
-        message: t('group:question.perform_transaction', {
+        message: t('core:question.perform_transaction', {
           action: 'GROUP_INVITE',
           postProcess: 'capitalizeFirst',
         }),

src/components/Group/ListOfMembers.tsx

@@ -59,7 +59,7 @@ const ListOfMembers = ({
     try {
       const fee = await getFee('GROUP_KICK');
       await show({
-        message: t('group:question.perform_transaction', {
+        message: t('core:question.perform_transaction', {
           action: 'GROUP_KICK',
           postProcess: 'capitalizeFirst',
         }),
@@ -117,7 +117,7 @@ const ListOfMembers = ({
       const fee = await getFee('GROUP_BAN');
 
       await show({
-        message: t('group:question.perform_transaction', {
+        message: t('core:question.perform_transaction', {
           action: 'GROUP_BAN',
           postProcess: 'capitalizeFirst',
         }),
@@ -177,7 +177,7 @@ const ListOfMembers = ({
     try {
       const fee = await getFee('ADD_GROUP_ADMIN');
       await show({
-        message: t('group:question.perform_transaction', {
+        message: t('core:question.perform_transaction', {
           action: 'ADD_GROUP_ADMIN',
           postProcess: 'capitalizeFirst',
         }),
@@ -234,7 +234,7 @@ const ListOfMembers = ({
     try {
       const fee = await getFee('REMOVE_GROUP_ADMIN');
       await show({
-        message: t('group:question.perform_transaction', {
+        message: t('core:question.perform_transaction', {
           action: 'REMOVE_GROUP_ADMIN',
           postProcess: 'capitalizeFirst',
         }),

src/components/Group/ManageMembers.tsx

@@ -84,7 +84,7 @@ export const ManageMembers = ({
       setIsLoadingLeave(true);
       const fee = await getFee('LEAVE_GROUP');
       await show({
-        message: t('group:question.perform_transaction', {
+        message: t('core:question.perform_transaction', {
           action: 'LEAVE_GROUP',
           postProcess: 'capitalizeFirst',
         }),

src/components/Group/UserListOfInvites.tsx

@@ -99,7 +99,7 @@ export const UserListOfInvites = ({
       const fee = await getFee('JOIN_GROUP');
 
       await show({
-        message: t('group:question.perform_transaction', {
+        message: t('core:question.perform_transaction', {
           action: 'JOIN_GROUP',
           postProcess: 'capitalizeFirst',
         }),

src/components/Minting/Minting.tsx

@@ -301,7 +301,7 @@ export const Minting = ({ setIsOpenMinting, myAddress, show }) => {
   const createRewardShare = useCallback(async (publicKey, recipient) => {
     const fee = await getFee('REWARD_SHARE');
     await show({
-      message: t('group:question.perform_transaction', {
+      message: t('core:question.perform_transaction', {
         // TODO move from group into core namespace
         action: 'REWARD_SHARE',
         postProcess: 'capitalizeFirst',

src/components/RegisterName.tsx

@@ -127,7 +127,7 @@ export const RegisterName = ({
 
       const fee = await getFee('REGISTER_NAME');
       await show({
-        message: t('group:question.register_name', {
+        message: t('core:question.register_name', {
           postProcess: 'capitalizeFirst',
         }),
         publishFee: fee.fee + ' QORT',

src/components/Save/Save.tsx

@@ -424,7 +424,7 @@ export const Save = ({ isDesktop, disableWidth, myName }) => {
                               fontSize: '14px',
                             }}
                           >
-                            {t('core:save_options.reset_qdn', {
+                            {t('core:question.reset_qdn', {
                               postProcess: 'capitalizeFirst',
                             })}
                           </Typography>
@@ -461,7 +461,7 @@ export const Save = ({ isDesktop, disableWidth, myName }) => {
                             }}
                           >
                             {' '}
-                            {t('core:save_options.reset_pinned', {
+                            {t('core:question.reset_pinned', {
                               postProcess: 'capitalizeFirst',
                             })}
                           </Typography>
@@ -495,7 +495,7 @@ export const Save = ({ isDesktop, disableWidth, myName }) => {
                           fontSize: '14px',
                         }}
                       >
-                        {t('core:save_options.overwrite_changes', {
+                        {t('core:question.overwrite_changes', {
                           postProcess: 'capitalizeFirst',
                         })}
                       </Typography>

src/i18n/locales/en/core.json

@@ -183,22 +183,27 @@
     "q_mail": "q-mail",
     "q_sandbox": "q-Sandbox"
   },
-  "save_options": {
+  "question": {
-    "no_pinned_changes": "you currently do not have any changes to your pinned apps",
+    "perform_transaction": "would you like to perform a {{action}} transaction?",
-    "overwrite_changes": "the app was unable to download your existing QDN-saved pinned apps. Would you like to overwrite those changes?",
+    "provide_thread": "please provide a thread title",
-    "overwrite_qdn": "overwrite to QDN",
     "publish_app": "would you like to publish this app?",
     "publish_qdn": "would you like to publish your settings to QDN (encrypted)?",
-    "qdn": "use QDN saving",
+    "overwrite_changes": "the app was unable to download your existing QDN-saved pinned apps. Would you like to overwrite those changes?",
     "rate_app": "would you like to rate this app a rating of {{ rate }}?. It will create a POLL tx.",
-    "register_name": "you need a registered Qortal name to save your pinned apps to QDN.",
+    "register_name": "would you like to register this name?",
     "reset_pinned": "don't like your current local changes? Would you like to reset to the default pinned apps?",
-    "reset_qdn": "don't like your current local changes? Would you like to reset to your saved QDN pinned apps?",
+    "reset_qdn": "don't like your current local changes? Would you like to reset to your saved QDN pinned apps?"
+  },
+  "save_options": {
+    "no_pinned_changes": "you currently do not have any changes to your pinned apps",
+    "overwrite_qdn": "overwrite to QDN",
+    "qdn": "use QDN saving",
+    "register_name": "you need a registered Qortal name to save your pinned apps to QDN.",
     "revert_default": "revert to default",
     "revert_qdn": "revert to QDN",
     "save_qdn": "save to QDN",
     "settings": "you are using the export/import way of saving settings.",
-    "unsaved_changes": " you have unsaved changes to your pinned apps. Save them to QDN."
+    "unsaved_changes": "you have unsaved changes to your pinned apps. Save them to QDN."
   },
   "server": "server",
   "settings": "settings",

src/i18n/locales/en/group.json

@@ -133,10 +133,5 @@
       "user_joined": "user successfully joined!"
     }
   },
-  "question": {
-    "perform_transaction": "would you like to perform a {{action}} transaction?",
-    "provide_thread": "please provide a thread title",
-    "register_name": "would you like to register this name?"
-  },
   "thread_posts": "new thread posts"
 }